summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2011-10-11 08:32:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 12:18:19 (GMT)
commitc973a6e4c5e4b5fa262c03cb505a1233f4217508 (patch)
treee54f2f2401187d8f3c09aa9a5f577ce5033c51b0 /meta/recipes-qt
parent88f81c7ffed38c0baab19f6e2ddf3eba7d409fa2 (diff)
downloadpoky-c973a6e4c5e4b5fa262c03cb505a1233f4217508.tar.gz
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) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc10
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() {
294 rm -f ${D}/${bindir}/lrelease 294 rm -f ${D}/${bindir}/lrelease
295 295
296 # fix pkgconfig, libtool and prl files 296 # fix pkgconfig, libtool and prl files
297 sed -i -e s#-L${S}/lib##g \ 297 sed -i -e s#-L${S}/lib/\?##g \
298 -e s#-L${STAGING_LIBDIR}##g \ 298 -e s#-L${STAGING_LIBDIR}/\?##g \
299 -e 's#STAGING_LIBDIR}#libdir}'#g \ 299 -e 's#STAGING_LIBDIR}#libdir}'#g \
300 -e s#-L${libdir}##g \ 300 -e s#-L${libdir}/\?##g \
301 -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \ 301 -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
302 -e s#" -Wl,-rpath-link,${S}/lib"##g \ 302 -e s#" -Wl,-rpath-link,${S}/lib/\?"##g \
303 -e s#" -Wl,-rpath-link,${libdir}"##g \ 303 -e s#" -Wl,-rpath-link,${libdir}/\?"##g \
304 -e 's#Iin#I${in#g' \ 304 -e 's#Iin#I${in#g' \
305 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc 305 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
306 306