summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorSimon Busch <morphis@gravedo.de>2011-10-07 10:01:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-15 12:05:26 (GMT)
commitb53805792c383822b78a194354d7c33c8fda28c2 (patch)
treec09f86e86c01dd95f13e5c3601da825bad878784 /meta/recipes-qt
parent022c3584034c45d1aecc55164faa9766ac67d03e (diff)
downloadpoky-b53805792c383822b78a194354d7c33c8fda28c2.tar.gz
qt4-x11-free: bring back pkg-config fixups
* With b40b9c024be5e1ec81a31961158b3e6b529acfe0 some pkg-config fixups where removed from qt4.inc which breaks the pkg-config files for qt4-embedded. Without that the pkg-config files for qt4-x11-free are broken. So this patch puts the fixes into the qt4-x11-free.inc file to be used by qt4-x11-free and not qt4-embedded. * Resending because nobody replied on http://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg10609.html (From OE-Core rev: 9086c7e2e106fb5188963a5dac4e1f1ff9d759d4) Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc16
1 files changed, 15 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index f391028..04b7885 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r32" 8INC_PR = "r33"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
@@ -16,3 +16,17 @@ QT_BASE_LIB ?= "libqt"
16 16
17inherit qt4x11 17inherit qt4x11
18 18
19do_install_append() {
20 # fix pkgconfig, libtool and prl files
21 sed -i -e 's#I/usr/include#Iincludedir}#g' \
22 -e 's#Iin#I${in#g' \
23 ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
24
25 # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so
26 # manually fix it up here:
27 for pc in ${D}${libdir}/pkgconfig/*.pc ; do
28 sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
29 -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
30 -e 's:IP{:I${:g' $pc
31 done
32}