From 8d580ed449c09a64483519d66e14a2e3b071806a Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Tue, 11 Oct 2011 16:32:23 +0800 Subject: 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 --- meta/recipes-qt/qt4/qt4.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-qt') 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 -- cgit v1.2.3