pkgconfig: sync with poky

* pkgconfig 0.23 added, disabled by default
* fiddled with 0.22 SRC_URI to to keep the .inc sane

diff --git a/packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch b/packages/pkgconfig/pkgconfig-0.22/sysrootfix.patch
similarity index 100%
rename from packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch
rename to packages/pkgconfig/pkgconfig-0.22/sysrootfix.patch

diff --git a/packages/pkgconfig/pkgconfig-native_0.23.bb b/packages/pkgconfig/pkgconfig-native_0.23.bb
new file mode 100644 (file)
index 0000000..c4028ab
--- /dev/null
+++ b/packages/pkgconfig/pkgconfig-native_0.23.bb
@@ -0,0 +1,8 @@
+require pkgconfig.inc
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+inherit native
+DEPENDS = ""

diff --git a/packages/pkgconfig/pkgconfig-sdk_0.23.bb b/packages/pkgconfig/pkgconfig-sdk_0.23.bb
index 8c40f04..3b20371 100644 (file)
--- a/packages/pkgconfig/pkgconfig-sdk_0.23.bb
+++ b/packages/pkgconfig/pkgconfig-sdk_0.23.bb
@@ -1,11 +1,6 @@
 require pkgconfig.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
-SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
-           file://autofoo.patch;patch=1 \
-           file://sysrootfix.patch;patch=1 \
-           file://glibconfig-sysdefs.h"
-
 S = "${WORKDIR}/pkg-config-${PV}/"
 inherit sdk
 DEPENDS = ""

diff --git a/packages/pkgconfig/pkgconfig.inc b/packages/pkgconfig/pkgconfig.inc
index 77c9e1c..939199b 100644 (file)
--- a/packages/pkgconfig/pkgconfig.inc
+++ b/packages/pkgconfig/pkgconfig.inc
@@ -5,10 +5,11 @@ It replaces the ubiquitous *-config scripts you may have \
 seen with a single tool."
 HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r7"
 
 SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
-           file://sysroot-support.patch;patch=1 \
+           file://autofoo.patch;patch=1 \
+           file://sysrootfix.patch;patch=1 \
            file://glibconfig-sysdefs.h"
 
 S = "${WORKDIR}/pkg-config-${PV}/"

diff --git a/packages/pkgconfig/pkgconfig_0.22.bb b/packages/pkgconfig/pkgconfig_0.22.bb
index 599e1c8..a0f5241 100644 (file)
--- a/packages/pkgconfig/pkgconfig_0.22.bb
+++ b/packages/pkgconfig/pkgconfig_0.22.bb
@@ -1,3 +1,2 @@
 require pkgconfig.inc
 
-SRC_URI += "file://autofoo.patch;patch=1"

diff --git a/packages/pkgconfig/pkgconfig_0.23.bb b/packages/pkgconfig/pkgconfig_0.23.bb
new file mode 100644 (file)
index 0000000..154e302
--- /dev/null
+++ b/packages/pkgconfig/pkgconfig_0.23.bb
@@ -0,0 +1,6 @@
+require pkgconfig.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS += "glib-2.0"
+EXTRA_OECONF = "--with-installed-glib"