summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/pkgconfig
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-11-29 20:54:42 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:30:33 +0000
commitf9ddae16ef31b2c1cd988e1b416a39d516c986c4 (patch)
treea0759b5ed5beb0d9e9acb3f76a2d9eb82af8ff4a /meta/recipes-devtools/pkgconfig
parent12acb6bb00ba665571fcfbdb0ef4668ca0a98d5b (diff)
downloadopenembedded-core-f9ddae16ef31b2c1cd988e1b416a39d516c986c4.tar.gz
openembedded-core-f9ddae16ef31b2c1cd988e1b416a39d516c986c4.tar.bz2
openembedded-core-f9ddae16ef31b2c1cd988e1b416a39d516c986c4.zip
pkgconfig: Add a manual dependency of pkgconfig(pkg-config)
The libtelepathy-glib-dev package contains a .pc file that has a requires of pkgconfig(pkg-config) > 0.21 in it. In order to satisfy this requirement we add a manual RPROVIDE to the pkgconfig package. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/pkgconfig')
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig.inc5
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb2
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_git.bb1
3 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
index 83a9cdf80a..27d407170c 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
@@ -37,3 +37,8 @@ BBCLASSEXTEND = "native nativesdk"
# files.
FILES_${PN}-dev = ""
FILES_${PN} += "${datadir}/aclocal/pkg.m4"
+
+# When using the RPM generated automatic package dependencies, some packages
+# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by
+# specifying an appropriate provide.
+RPROVIDES_${PN} += "pkgconfig(pkg-config) (= ${PV})"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
index 1e60c54cbf..d0a2b1f9e5 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_0.25.bb
@@ -1,6 +1,6 @@
require pkgconfig.inc
-PR = "r5"
+PR = "r6"
SRC_URI[md5sum] = "a3270bab3f4b69b7dc6dbdacbcae9745"
SRC_URI[sha256sum] = "3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e"
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index 6271992910..d5ec8fcf79 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -8,6 +8,7 @@ S = "${WORKDIR}/git/"
SRCREV = "66d49f1375fec838bcd301bb4ca2ef76cee0e47c"
PV = "0.23+git${SRCPV}"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"