From 90a4f95d3d4c2b30d8e2b1c8ffbd8b3fbc84436a Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Tue, 11 Oct 2011 16:32:23 +0800 Subject: [PATCH] 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. (From OE-Core rev: 8d580ed449c09a64483519d66e14a2e3b071806a) (From OE-Core rev: 9f655fbf0f818e25fdbf247334881da07a29e815) Signed-off-by: Wenzong Fan Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 7d91f19c4f..9ff33eca74 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -289,13 +289,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