From c61fc95d2deb7924357f73ef1cd4b42bba956376 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 2 Jun 2008 08:56:39 +0000
Subject: [PATCH] pkgconfig: sync with poky * pkgconfig 0.23 added, disabled by
 default * fiddled with 0.22 SRC_URI to to keep the .inc sane

---
 .../{sysroot-support.patch => sysrootfix.patch}           | 0
 packages/pkgconfig/pkgconfig-native_0.23.bb               | 8 ++++++++
 packages/pkgconfig/pkgconfig-sdk_0.23.bb                  | 5 -----
 packages/pkgconfig/pkgconfig.inc                          | 5 +++--
 packages/pkgconfig/pkgconfig_0.22.bb                      | 1 -
 packages/pkgconfig/pkgconfig_0.23.bb                      | 6 ++++++
 6 files changed, 17 insertions(+), 8 deletions(-)
 rename packages/pkgconfig/pkgconfig-0.22/{sysroot-support.patch => sysrootfix.patch} (100%)
 create mode 100644 packages/pkgconfig/pkgconfig-native_0.23.bb
 create mode 100644 packages/pkgconfig/pkgconfig_0.23.bb

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
index 0000000000..c4028ab43c
--- /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 8c40f04e10..3b20371777 100644
--- 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 77c9e1c5a5..939199bc37 100644
--- 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 599e1c815e..a0f5241a12 100644
--- 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
index 0000000000..154e302844
--- /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"
-- 
2.39.5