From: Wenzong Fan <wenzong....@windriver.com>
[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....@windriver.com>
---
meta/recipes-qt/qt4/qt4.inc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index d6382f5..1406a87 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
--
1.7.0.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
