From patchwork Thu Oct 13 02:22:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/1] qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe. Date: Thu, 13 Oct 2011 02:22:59 -0000 From: wenzong.fan@windriver.com X-Patchwork-Id: 13081 Message-Id: <98a9c26c02e87af50d659b4c3f2c83dca9921277.1318472103.git.wenzong.fan@windriver.com> To: From: Wenzong Fan [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 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