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. (From OE-Core rev: b40b9c024be5e1ec81a31961158b3e6b529acfe0) (From OE-Core rev: 960318ebd271ad5330a0863047927ab827b5e107) Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
ae97dbe1db
commit
84865e45ea
|
@ -3,7 +3,7 @@ SECTION = "libs"
|
|||
LICENSE = "LGPLv2.1 | GPLv3"
|
||||
HOMEPAGE = "http://qt.nokia.com"
|
||||
DEPENDS += "directfb tslib"
|
||||
INC_PR = "r30"
|
||||
INC_PR = "r31"
|
||||
|
||||
QT_BASE_NAME ?= "qt4-embedded"
|
||||
QT_BASE_LIB ?= "libqt-embedded"
|
||||
|
|
|
@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
|
|||
SECTION = "x11/libs"
|
||||
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
|
||||
|
||||
INC_PR = "r27"
|
||||
INC_PR = "r28"
|
||||
|
||||
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
|
||||
QT_GLFLAGS_qemux86 = "-opengl"
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue