summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2011-11-29 11:47:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-29 13:46:28 +0000
commit4f408de16bedeab1ffe4fa80100bb60d5335bf97 (patch)
treefc81047921d5ecf3c4d35f47694833cb42c2b29a
parente82ae043619de3c6ff068254a43517e8d7c048a2 (diff)
downloadpoky-4f408de16bedeab1ffe4fa80100bb60d5335bf97.tar.gz
qt4: fix sed to have correct *.pc files
it seems sed doesn't handle \? properly if the string in not between quotes. without this patch, we get something like (for example for QtDBusE.pc : Libs: -L${libdir} -lQtDBusE Libs.private: -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/ usr/lib -L/usr/lib -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board /usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir} with the patch we get what is expected : Libs: -L${libdir} -lQtDBusE Libs.private: -lQtXmlE -lQtCoreE -lpthread Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir} (From OE-Core rev: 2e635b4fe6be9d5bfcdd837a523833b7eb0819a0) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc10
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index bee7345ff0..c4f6e980d1 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
3LICENSE = "LGPLv2.1 | GPLv3" 3LICENSE = "LGPLv2.1 | GPLv3"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5DEPENDS += "directfb tslib" 5DEPENDS += "directfb tslib"
6INC_PR = "r36" 6INC_PR = "r37"
7 7
8QT_BASE_NAME ?= "qt4-embedded" 8QT_BASE_NAME ?= "qt4-embedded"
9QT_BASE_LIB ?= "libqt-embedded" 9QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 04b788560a..029c61e447 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r33" 8INC_PR = "r34"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 4dc9a75e57..bec81b4645 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -294,13 +294,13 @@ do_install() {
294 rm -f ${D}/${bindir}/lrelease 294 rm -f ${D}/${bindir}/lrelease
295 295
296 # fix pkgconfig, libtool and prl files 296 # fix pkgconfig, libtool and prl files
297 sed -i -e s#-L${S}/lib/\?##g \ 297 sed -i -e 's#-L${S}/lib/\?##g' \
298 -e s#-L${STAGING_LIBDIR}/\?##g \ 298 -e 's#-L${STAGING_LIBDIR}/\?##g' \
299 -e 's#STAGING_LIBDIR}#libdir}'#g \ 299 -e 's#STAGING_LIBDIR}#libdir}'#g \
300 -e s#-L${libdir}/\?##g \ 300 -e 's#-L${libdir}/\?##g' \
301 -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \ 301 -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
302 -e s#" -Wl,-rpath-link,${S}/lib/\?"##g \ 302 -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
303 -e s#" -Wl,-rpath-link,${libdir}/\?"##g \ 303 -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
304 -e 's#Iin#I${in#g' \ 304 -e 's#Iin#I${in#g' \
305 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc 305 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
306 306