[oe-commits] org.oe.dev qt 4.3.0: pkgconfig fixes

[polyonymous commit]

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

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 6798f7bff709d8832a9dc494fce4ac4209ea8bc8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6798f7bff709d8832a9dc494fce4ac4209ea8bc8
Files:
1
packages/qt/qt4-x11-free_4.3.0.bb
Diffs:

#
# mt diff -r3947e6ea2ac70ad4bec0057f3135b41ee82718a3 -r6798f7bff709d8832a9dc494fce4ac4209ea8bc8
#
# 
# 
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
#  from [b6c475e3228f1ab3b3a6e4a86adaf21815516d9e]
#    to [9cc09d8cdd4f53ae7503b1a7dccf8907c9472431]
# 
============================================================
--- packages/qt/qt4-x11-free_4.3.0.bb	b6c475e3228f1ab3b3a6e4a86adaf21815516d9e
+++ packages/qt/qt4-x11-free_4.3.0.bb	9cc09d8cdd4f53ae7503b1a7dccf8907c9472431
@@ -1,8 +1,8 @@ LICENSE = "GPL QPL"
 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 @@ PARALLEL_MAKE = ""
 
 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...