pkgconfig: Fix compile issues for non-native version

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2301 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 34 insertions, 27 deletions

diff --git a/meta/packages/pkgconfig/pkgconfig-native_0.22.bb b/meta/packages/pkgconfig/pkgconfig-native_0.22.bb
index 507a74b7d..5a5423058 100644
--- a/meta/packages/pkgconfig/pkgconfig-native_0.22.bb
+++ b/meta/packages/pkgconfig/pkgconfig-native_0.22.bb
@@ -1,7 +1,14 @@
 SECTION = "console/utils"
-require pkgconfig_${PV}.bb
+require pkgconfig.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
 S = "${WORKDIR}/pkg-config-${PV}/"
 inherit native
 DEPENDS = ""
+
+do_configure() {
+        gnu-configize
+	libtoolize --force
+	oe_runconf
+}
+			 
\ No newline at end of file
diff --git a/meta/packages/pkgconfig/pkgconfig.inc b/meta/packages/pkgconfig/pkgconfig.inc
new file mode 100644
index 000000000..47c077a8d
--- /dev/null
+++ b/meta/packages/pkgconfig/pkgconfig.inc
@@ -0,0 +1,24 @@
+SECTION = "console/utils"
+DESCRIPTION = "pkg-config is a system for managing library \
+compile/link flags that works with automake and autoconf. \
+It replaces the ubiquitous *-config scripts you may have \
+seen with a single tool."
+HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+
+inherit autotools
+
+acpaths = "-I ."
+do_configure_prepend () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
+}
+
+do_stage_prepend() {
+	install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
+}
diff --git a/meta/packages/pkgconfig/pkgconfig_0.22.bb b/meta/packages/pkgconfig/pkgconfig_0.22.bb
index 28cf2c53f..599e1c815 100644
--- a/meta/packages/pkgconfig/pkgconfig_0.22.bb
+++ b/meta/packages/pkgconfig/pkgconfig_0.22.bb
@@ -1,27 +1,3 @@
-SECTION = "console/utils"
-DESCRIPTION = "pkg-config is a system for managing library \
-compile/link flags that works with automake and autoconf. \
-It replaces the ubiquitous *-config scripts you may have \
-seen with a single tool."
-HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
-LICENSE = "GPL"
+require pkgconfig.inc
 
-SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
-           file://glibconfig-sysdefs.h"
-
-S = "${WORKDIR}/pkg-config-${PV}/"
-
-inherit autotools
-
-acpaths = "-I ."
-do_configure () {
-	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
-	gnu-configize
-	libtoolize --force
-        oe_runconf
-}
-
-do_stage_prepend() {
-	install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
-
-}
+SRC_URI += "file://autofoo.patch;patch=1"