From: Michael Krelin <hacker@klever.net>
Date: Sat, 9 Jun 2007 17:13:31 +0000 (+0000)
Subject: qt 4.3.0: pkgconfig fixes
X-Git-Tag: Release-2010-05/1~8868^2~400^2~22^2~10
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c32895788f9f58f1888922e102d482f9aa9fb4ed;p=openembedded.git

qt 4.3.0: pkgconfig fixes
- manually cleanup .pcs that aren't fixed by qt
- remove pkgconfig class as it screws up staging badly
---

diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.0.bb
index bf8097e1b9..35fa1ccd62 100644
--- a/packages/qt/qt4-x11-free_4.3.0.bb
+++ b/packages/qt/qt4-x11-free_4.3.0.bb
@@ -2,7 +2,7 @@ SECTION = "x11/libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
-DEPENDS = "uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor dbus openssl"
+DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 xft libxext libxrender libxrandr libxcursor dbus openssl"
 RDEPENDS_${PN} = "${NONDEV_PACKAGES}"
 PROVIDES = "qt4x11"
 
@@ -20,7 +20,7 @@ S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
 
 PARALLEL_MAKE = ""
 
-inherit qmake-base qt4x11 pkgconfig
+inherit qmake-base qt4x11
 
 export QTDIR = "${S}"
 STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4"
@@ -77,6 +77,12 @@ do_stage() {
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
 	install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
 	sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g'  ${STAGING_QT_DIR}/mkspecs/qconfig.pri
+	for pc in ${STAGING_QT_DIR}/lib/pkgconfig/Qt{AssistantClient,DBus,Test,UiTools}.pc ; do
+		sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' $pc
+	done
+        for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do
+                install -m 0644 $pc ${PKG_CONFIG_PATH}/
+        done
 }
 
 # FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well...