diff options
author | Simon Busch <morphis@gravedo.de> | 2011-09-25 14:57:43 +0200 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-09-27 23:54:28 -0700 |
commit | b40b9c024be5e1ec81a31961158b3e6b529acfe0 (patch) | |
tree | dd6f32cc19f2e0ef6bf04e5ad972850b688b94e0 /meta/recipes-qt/qt4/qt4.inc | |
parent | 1577975202437f8f89ef24a5e4d3f6c6c8a88c5c (diff) | |
download | openembedded-core-b40b9c024be5e1ec81a31961158b3e6b529acfe0.tar.gz openembedded-core-b40b9c024be5e1ec81a31961158b3e6b529acfe0.tar.bz2 openembedded-core-b40b9c024be5e1ec81a31961158b3e6b529acfe0.tar.xz openembedded-core-b40b9c024be5e1ec81a31961158b3e6b529acfe0.zip |
meta: qt4: fix postprocessing of pkg-config files
When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong.
The Cflags variable contains something like ${includedir}/qtopia/QtCore where
${includedir} is already /usr/include/qtopia/QtCore.
This patch reverts the fix up of the Cflags variable implemented in do_install.
Signed-off-by: Simon Busch <morphis@gravedo.de>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 5545be700..7f3e1a478 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -293,7 +293,6 @@ do_install() { -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#I/usr/include#Iincludedir}#g' \ -e 's#Iin#I${in#g' \ ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc @@ -310,8 +309,7 @@ do_install() { # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so manually fix it up here: for pc in ${D}${libdir}/pkgconfig/*.pc ; do - sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \ - -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \ + sed -i -e "s:prefix}include/${QT_DIR_NAME}/$(basename $pc .pc):prefix}/include:" \ -e 's:IP{:I${:g' $pc done |