Patchwork [1/1] qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe.

login
register
mail settings
Submitter wenzong.fan@windriver.com
Date Oct. 13, 2011, 2:22 a.m.
Message ID <98a9c26c02e87af50d659b4c3f2c83dca9921277.1318472103.git.wenzong.fan@windriver.com>
Download mbox | patch
Permalink /patch/13081/
State New, archived
Headers show

Comments

wenzong.fan@windriver.com - Oct. 13, 2011, 2:22 a.m.
From: Wenzong Fan <wenzong.fan@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.fan@windriver.com>
---
 meta/recipes-qt/qt4/qt4.inc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Patch

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