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

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: a6a18f676265371134e8944deb4be3fa0724a352
ViewMTN: http://monotone.openembedded.org/revision/info/a6a18f676265371134e8944deb4be3fa0724a352
Files:
1
packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch
packages/pkgconfig/pkgconfig-0.22/sysrootfix.patch
packages/pkgconfig/pkgconfig-native_0.23.bb
packages/pkgconfig/pkgconfig_0.23.bb
packages/pkgconfig/pkgconfig-sdk_0.23.bb
packages/pkgconfig/pkgconfig.inc
packages/pkgconfig/pkgconfig_0.22.bb
Diffs:

#
# mt diff -r6ebd050b263f16bcc01c24afac045acd6f06146e -ra6a18f676265371134e8944deb4be3fa0724a352
#
#
#
# rename "packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch"
#     to "packages/pkgconfig/pkgconfig-0.22/sysrootfix.patch"
# 
# add_file "packages/pkgconfig/pkgconfig-native_0.23.bb"
#  content [56c62cd024cc3d6b128bb32020dce3bce5718ab4]
# 
# add_file "packages/pkgconfig/pkgconfig_0.23.bb"
#  content [2b0110fc9a21558735c84a163946c2f59950d5f4]
# 
# patch "packages/pkgconfig/pkgconfig-sdk_0.23.bb"
#  from [056f414e305029ccb846930c8bdaf00f04c60300]
#    to [46ce3f4b022cd893358c5c2c56e60880dd37c5ab]
# 
# patch "packages/pkgconfig/pkgconfig.inc"
#  from [a8c84b8e716d79aae861977ee313a4e0922ebf85]
#    to [d05a1a9cacef34ddae7e26976bb4be2bfeed5365]
# 
# patch "packages/pkgconfig/pkgconfig_0.22.bb"
#  from [7451685724ef3ea626d42a65961f81e03f489379]
#    to [6a04d268f1f2abd9d474e9d28af24c8e532dae21]
#
============================================================
--- packages/pkgconfig/pkgconfig-native_0.23.bb	56c62cd024cc3d6b128bb32020dce3bce5718ab4
+++ packages/pkgconfig/pkgconfig-native_0.23.bb	56c62cd024cc3d6b128bb32020dce3bce5718ab4
@@ -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 = ""
============================================================
--- packages/pkgconfig/pkgconfig_0.23.bb	2b0110fc9a21558735c84a163946c2f59950d5f4
+++ packages/pkgconfig/pkgconfig_0.23.bb	2b0110fc9a21558735c84a163946c2f59950d5f4
@@ -0,0 +1,6 @@
+require pkgconfig.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS += "glib-2.0"
+EXTRA_OECONF = "--with-installed-glib"
============================================================
--- packages/pkgconfig/pkgconfig-sdk_0.23.bb	056f414e305029ccb846930c8bdaf00f04c60300
+++ packages/pkgconfig/pkgconfig-sdk_0.23.bb	46ce3f4b022cd893358c5c2c56e60880dd37c5ab
@@ -1,11 +1,6 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 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 = ""
============================================================
--- packages/pkgconfig/pkgconfig.inc	a8c84b8e716d79aae861977ee313a4e0922ebf85
+++ packages/pkgconfig/pkgconfig.inc	d05a1a9cacef34ddae7e26976bb4be2bfeed5365
@@ -5,10 +5,11 @@ LICENSE = "GPL"
 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}/"
============================================================
--- packages/pkgconfig/pkgconfig_0.22.bb	7451685724ef3ea626d42a65961f81e03f489379
+++ packages/pkgconfig/pkgconfig_0.22.bb	6a04d268f1f2abd9d474e9d28af24c8e532dae21
@@ -1,3 +1,2 @@ require pkgconfig.inc
 require pkgconfig.inc
 
-SRC_URI += "file://autofoo.patch;patch=1"