summaryrefslogtreecommitdiff
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2011-10-11 16:32:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 12:53:32 +0100
commit8d580ed449c09a64483519d66e14a2e3b071806a (patch)
tree0b3e733d4aeede34e5b5e7ad89a5eb1f94560ef3 /meta/recipes-qt
parent2d2ac8bbbbb98080ad339113c3f27f9573374be2 (diff)
downloadopenembedded-core-8d580ed449c09a64483519d66e14a2e3b071806a.tar.gz
openembedded-core-8d580ed449c09a64483519d66e14a2e3b071806a.tar.bz2
openembedded-core-8d580ed449c09a64483519d66e14a2e3b071806a.tar.xz
openembedded-core-8d580ed449c09a64483519d66e14a2e3b071806a.zip
qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe.
[YOCTO #1671] qt4-x11-free's recipe includes a sed script to sanitize it's .prl files, which are used by qmake to generate a list of libs and includes in the Makefiles it generates. It however, fails to take into account the possibility of trailing slashes, and thus leaves them in, and breaks gcc's syntax. Update these regexes to account for them. Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index d6382f56d..1406a874e 100644
--- 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