[oe-commits] org.oe.dev Fix PKG_CONFIG_PATH references which should be PKG_CONFIG_DIR

[rpurdie commit]

Fix PKG_CONFIG_PATH references which should be PKG_CONFIG_DIR

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 1782824892f0d4279b2ae8beb55943e974a6dbe2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1782824892f0d4279b2ae8beb55943e974a6dbe2
Files:
1
classes/gtk-binver.bbclass
classes/pkgconfig.bbclass
packages/gnome/libsoup_2.2.100.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/xcalibrateext/xcalibrateext_git.bb
packages/xfce/xfce-mcs-manager.inc
Diffs:

#
# mt diff -r068146008b7c87a1880b72e17b5b0c1b302a5129 -r1782824892f0d4279b2ae8beb55943e974a6dbe2
#
# 
# 
# patch "classes/gtk-binver.bbclass"
#  from [cc323de5673190cbd0ddba2a5e9c48dfd81055b9]
#    to [090b062f40915666e474c6e90a0d13796fdd2cc6]
# 
# patch "classes/pkgconfig.bbclass"
#  from [7fbd67747ce8dbd5a57e8e7b03e4b94c34647b0c]
#    to [63cdda1bfc6dad494dbd704675246aa24fc852ae]
# 
# patch "packages/gnome/libsoup_2.2.100.bb"
#  from [42622e2e11666cee24fce98545e6b2ececc58a0d]
#    to [cbf6cd8728f99799c3c69d03a0083411b5f652f9]
# 
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
#  from [457aaaa25dd85451f4252d6535b8e314cce24ea4]
#    to [81b2d4f19a5e7a05beed1318a962589e6c8beac9]
# 
# patch "packages/xcalibrateext/xcalibrateext_git.bb"
#  from [fbe4e58535ff2b83bd1fe6a81b46d6a6c8207c89]
#    to [14e93ba83f145d88b878ee580af2d5ca7d2209e9]
# 
# patch "packages/xfce/xfce-mcs-manager.inc"
#  from [05d1e84b36f47074c522ad99ac7f75510f57cbdd]
#    to [ab08f11a65be464e62d6217782ab1660925adc1e]
# 
============================================================
--- classes/gtk-binver.bbclass	cc323de5673190cbd0ddba2a5e9c48dfd81055b9
+++ classes/gtk-binver.bbclass	090b062f40915666e474c6e90a0d13796fdd2cc6
@@ -1,7 +1,7 @@ def gtkbinver_find(d):
 def gtkbinver_find(d):
     import bb
     try:
-        for line in file( "%s/gtk+-2.0.pc" % bb.data.getVar('PKG_CONFIG_PATH', d, 1) ).readlines():
+        for line in file( "%s/gtk+-2.0.pc" % bb.data.getVar('PKG_CONFIG_DIR', d, 1) ).readlines():
             if line.startswith( "gtk_binary_version" ):
                 # bb.note( "gtk_binary_version = '%s'" % line.split("=")[1].strip() )
                 return line.split("=")[1].strip()
============================================================
--- classes/pkgconfig.bbclass	7fbd67747ce8dbd5a57e8e7b03e4b94c34647b0c
+++ classes/pkgconfig.bbclass	63cdda1bfc6dad494dbd704675246aa24fc852ae
@@ -31,7 +31,7 @@ do_stage_append () {
 do_stage_append () {
 	for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
 		pcname=`basename $pc`
-		install -d ${PKG_CONFIG_PATH}
-		cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_PATH}/$pcname
+		install -d ${PKG_CONFIG_DIR}
+		cat $pc | sed ${@get_pkgconfig_mangle(d)} -e 's:${D}${libdir}\S*:${STAGING_LIBDIR}:g' -e 's:${D}${prefix}/include\S*:${STAGING_INCDIR}:g' > ${PKG_CONFIG_DIR}/$pcname
 	done
 }
============================================================
--- packages/gnome/libsoup_2.2.100.bb	42622e2e11666cee24fce98545e6b2ececc58a0d
+++ packages/gnome/libsoup_2.2.100.bb	cbf6cd8728f99799c3c69d03a0083411b5f652f9
@@ -8,9 +8,9 @@ do_stage() {
 inherit autotools pkgconfig
 
 do_stage() {
-	rm -f ${PKG_CONFIG_PATH}/libsoup*
+	rm -f ${PKG_CONFIG_DIR}/libsoup*
 	autotools_stage_all
-	ln -sf ${PKG_CONFIG_PATH}/libsoup.pc ${PKG_CONFIG_PATH}/libsoup-2.2.pc
+	ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc
 }
 
 FILES_${PN} = "${libdir}/lib*.so.*"
============================================================
--- packages/qt/qt4-x11-free_4.3.0.bb	457aaaa25dd85451f4252d6535b8e314cce24ea4
+++ packages/qt/qt4-x11-free_4.3.0.bb	81b2d4f19a5e7a05beed1318a962589e6c8beac9
@@ -81,9 +81,10 @@ do_stage() {
 	for pcc in AssistantClient DBus Test UiTools ; do
 		sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc
 	done
+	install -d ${PKG_CONFIG_DIR}/
         for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do
 		sed -i -e 's,$(OE_QMAKE_LIBS_X11),-lX11 -lXext,g' $pc
-                install -m 0644 $pc ${PKG_CONFIG_PATH}/
+                install -m 0644 $pc ${PKG_CONFIG_DIR}/
         done
 }
 
============================================================
--- packages/xcalibrateext/xcalibrateext_git.bb	fbe4e58535ff2b83bd1fe6a81b46d6a6c8207c89
+++ packages/xcalibrateext/xcalibrateext_git.bb	14e93ba83f145d88b878ee580af2d5ca7d2209e9
@@ -13,5 +13,5 @@ do_stage() {
 do_stage() {
 	autotools_stage_all
 	#make it compatible with the old package from cvs
-	ln -sf ${PKG_CONFIG_PATH}/xcalibrateproto.pc ${PKG_CONFIG_PATH}/xcalibrateext.pc
+	ln -sf ${PKG_CONFIG_DIR}/xcalibrateproto.pc ${PKG_CONFIG_DIR}/xcalibrateext.pc
 }
============================================================
--- packages/xfce/xfce-mcs-manager.inc	05d1e84b36f47074c522ad99ac7f75510f57cbdd
+++ packages/xfce/xfce-mcs-manager.inc	ab08f11a65be464e62d6217782ab1660925adc1e
@@ -20,6 +20,6 @@ do_stage_append () {
 # for this particular .pc, so the following will suffice:
 
 do_stage_append () {
-	install -d ${PKG_CONFIG_PATH}
-	sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_PATH}/xfce-mcs-manager.pc
+	install -d ${PKG_CONFIG_DIR}
+	sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc
 }