[oe-commits] org.oe.dev pkgconfig: sync with poky

[koen commit]

pkgconfig: sync with poky

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: c575740a3b6935cc9e85bcc4e6f3cec52b4c4028
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c575740a3b6935cc9e85bcc4e6f3cec52b4c4028
Files:
1
packages/pkgconfig/pkgconfig.inc
packages/pkgconfig/pkgconfig-native_0.22.bb
packages/pkgconfig/pkgconfig_0.15.0.bb
packages/pkgconfig/pkgconfig_0.22.bb
Diffs:

#
# mt diff -r12b138279c360841bb21419b7866a60b4a10932c -rc575740a3b6935cc9e85bcc4e6f3cec52b4c4028
#
# 
# 
# add_file "packages/pkgconfig/pkgconfig.inc"
#  content [4721122cb57ad9aec15fca1982b594f2e74d5e95]
# 
# patch "packages/pkgconfig/pkgconfig-native_0.22.bb"
#  from [1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d]
#    to [fbbe71ce4ad53ae89ee9e30d2726443eaeb38ecd]
# 
# patch "packages/pkgconfig/pkgconfig_0.15.0.bb"
#  from [14b923747d6c583fc5afdfb3e3164300509868fe]
#    to [452db50b3d54194460e72fd5ca6b17828bea0981]
# 
# patch "packages/pkgconfig/pkgconfig_0.22.bb"
#  from [fffbd20e4754ed405bc7f24d8eacec693adf09f7]
#    to [7451685724ef3ea626d42a65961f81e03f489379]
# 
============================================================
--- packages/pkgconfig/pkgconfig.inc	4721122cb57ad9aec15fca1982b594f2e74d5e95
+++ packages/pkgconfig/pkgconfig.inc	4721122cb57ad9aec15fca1982b594f2e74d5e95
@@ -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
+}
============================================================
--- packages/pkgconfig/pkgconfig-native_0.22.bb	1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d
+++ packages/pkgconfig/pkgconfig-native_0.22.bb	fbbe71ce4ad53ae89ee9e30d2726443eaeb38ecd
@@ -1,7 +1,14 @@ SECTION = "console/utils"
 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
+}
+			 
============================================================
--- packages/pkgconfig/pkgconfig_0.15.0.bb	14b923747d6c583fc5afdfb3e3164300509868fe
+++ packages/pkgconfig/pkgconfig_0.15.0.bb	452db50b3d54194460e72fd5ca6b17828bea0981
@@ -12,7 +12,7 @@ SRC_URI = "http://www.freedesktop.org/so
            file://pkg.m4 \
            file://glibconfig-sysdefs.h"
 
-inherit autotools
+inherit autotools 
 
 acpaths = "-I ."
 do_configure_prepend () {
============================================================
--- packages/pkgconfig/pkgconfig_0.22.bb	fffbd20e4754ed405bc7f24d8eacec693adf09f7
+++ packages/pkgconfig/pkgconfig_0.22.bb	7451685724ef3ea626d42a65961f81e03f489379
@@ -1,30 +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"
-PR = "r0"
+require pkgconfig.inc
 
+SRC_URI += "file://autofoo.patch;patch=1"
-DEFAULT_PREFERENCE  = "-1"
-
-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
-
-}