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}

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index bee7345ff0b665a9ccc5a70adfbc465176fea81a..c4f6e980d1d7e5ee0b3a75ba37951ac2c5cc51ba 100644 (file)
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1 | GPLv3"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r36"
+INC_PR = "r37"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_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 04b788560ad15c9284a2e8fe042a710c0c01e9d6..029c61e447f5e5f70c3eb52589292a4d63f71317 100644 (file)
--- 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"
 SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r33"
+INC_PR = "r34"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 4dc9a75e5796482ba2ebd023f31980d3bab48a7b..bec81b4645e0ffb5fcc0ea196c263e8c2d63d78d 100644 (file)
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -294,13 +294,13 @@ do_install() {
        rm -f ${D}/${bindir}/lrelease
 
        # fix pkgconfig, libtool and prl files
-       sed -i -e s#-L${S}/lib/\?##g \
-                       -e s#-L${STAGING_LIBDIR}/\?##g \
+       sed -i -e 's#-L${S}/lib/\?##g' \
+                       -e 's#-L${STAGING_LIBDIR}/\?##g' \
                        -e 's#STAGING_LIBDIR}#libdir}'#g \
-                       -e s#-L${libdir}/\?##g \
+                       -e 's#-L${libdir}/\?##g' \
                        -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
-                       -e s#" -Wl,-rpath-link,${S}/lib/\?"##g \
-                       -e s#" -Wl,-rpath-link,${libdir}/\?"##g \
+                       -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \
+                       -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \
                        -e 's#Iin#I${in#g' \
                        ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc