sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wenzong Fan 2011-10-11 16:32:23 +08:00 committed by Richard Purdie
parent 53db004d24
commit 90a4f95d3d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-qt/qt4/qt4.inc
View File

@ -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