diff options
| -rw-r--r-- | classes/gtk-binver.bbclass | 2 | ||||
| -rw-r--r-- | classes/pkgconfig.bbclass | 4 | ||||
| -rw-r--r-- | packages/gnome/libsoup_2.2.100.bb | 4 | ||||
| -rw-r--r-- | packages/qt/qt4-x11-free_4.3.0.bb | 3 | ||||
| -rw-r--r-- | packages/xcalibrateext/xcalibrateext_git.bb | 2 | ||||
| -rw-r--r-- | packages/xfce/xfce-mcs-manager.inc | 4 |
6 files changed, 10 insertions, 9 deletions
diff --git a/classes/gtk-binver.bbclass b/classes/gtk-binver.bbclass index 8398cc5424..52082492e7 100644 --- a/classes/gtk-binver.bbclass +++ b/classes/gtk-binver.bbclass @@ -1,7 +1,7 @@ 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() diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index 3256977517..c795c8a709 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -31,7 +31,7 @@ do_install_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 } diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb index 701ab1556d..e829ad39ca 100644 --- a/packages/gnome/libsoup_2.2.100.bb +++ b/packages/gnome/libsoup_2.2.100.bb @@ -8,9 +8,9 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" 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.*" diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.0.bb index 8ad20178bb..8d68642417 100644 --- a/packages/qt/qt4-x11-free_4.3.0.bb +++ b/packages/qt/qt4-x11-free_4.3.0.bb @@ -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 } diff --git a/packages/xcalibrateext/xcalibrateext_git.bb b/packages/xcalibrateext/xcalibrateext_git.bb index 16955b5753..51649c9be3 100644 --- a/packages/xcalibrateext/xcalibrateext_git.bb +++ b/packages/xcalibrateext/xcalibrateext_git.bb @@ -13,5 +13,5 @@ inherit autotools pkgconfig 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 } diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc index c50bf0ca64..e4fa10f07f 100644 --- a/packages/xfce/xfce-mcs-manager.inc +++ b/packages/xfce/xfce-mcs-manager.inc @@ -20,6 +20,6 @@ do_stage() { # 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 } |