summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-09-11 10:37:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-11 10:46:17 +0100
commit6c57503ebd6bd1fb03052f685d1c6ee8e6e9840e (patch)
treeeb46ac5a01ff160ef0f85e11c81d43be30975f4b
parenta75936df894f92f225f9545d0b5f2d65f5020184 (diff)
downloadpoky-6c57503ebd6bd1fb03052f685d1c6ee8e6e9840e.tar.gz
pkgconf: don't use alternatives
There's no need to do alternatives as pkgconf and pkg-config won't be installed at the same time, and pkg-config doesn't do alternatives either. (From OE-Core rev: d638fe0cc84b72b9159767a862ad37550469eae8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb
index 2021d1ac60..415478d5cf 100644
--- a/meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb
+++ b/meta/recipes-devtools/pkgconf/pkgconf_1.5.3.bb
@@ -24,7 +24,7 @@ SRC_URI = "\
24SRC_URI[md5sum] = "c21743bca14c882c0f282746168a5edc" 24SRC_URI[md5sum] = "c21743bca14c882c0f282746168a5edc"
25SRC_URI[sha256sum] = "d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715" 25SRC_URI[sha256sum] = "d3468308553c94389dadfd10c4d1067269052b5364276a9d24a643c88485f715"
26 26
27inherit autotools update-alternatives 27inherit autotools
28 28
29EXTRA_OECONF += "--with-pkg-config-dir='${libdir}/pkgconfig:${datadir}/pkgconfig'" 29EXTRA_OECONF += "--with-pkg-config-dir='${libdir}/pkgconfig:${datadir}/pkgconfig'"
30 30
@@ -46,8 +46,6 @@ do_install_append_class-native () {
46 install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk 46 install -m755 ${B}/pkg-config-esdk ${D}${bindir}/pkg-config-esdk
47} 47}
48 48
49ALTERNATIVE_${PN} = "pkg-config"
50
51# When using the RPM generated automatic package dependencies, some packages 49# When using the RPM generated automatic package dependencies, some packages
52# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by 50# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by
53# specifying an appropriate provide. 51# specifying an appropriate provide.