summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-23 17:20:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:10 +0000
commitdfd5c4d47deef35e998327ad34992df27b38a3fe (patch)
tree384501faf6c05ee39b3d6a3478b9fc510abb7920 /meta/recipes-devtools
parent61c68876d506a1f10a7db6c6a68526a161c18aa5 (diff)
downloadpoky-dfd5c4d47deef35e998327ad34992df27b38a3fe.tar.gz
pkgconfig: merge .bb and .inc
The .inc file included version information and wasn't used anywhere as the same .bb handles all variations, so merge them to reduce complexity. (From OE-Core rev: 5c877cd5d211220b145bc88d962673a0e8a7c0c4) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig.inc49
-rw-r--r--meta/recipes-devtools/pkgconfig/pkgconfig_git.bb55
2 files changed, 51 insertions, 53 deletions
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc
deleted file mode 100644
index c2a15235f6..0000000000
--- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc
+++ /dev/null
@@ -1,49 +0,0 @@
1SUMMARY = "Helper tool used when compiling"
2DESCRIPTION = "pkg-config is a helper tool used when compiling applications and libraries. It helps determined \
3the correct compiler/link options. It is also language-agnostic."
4HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
5BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=pkg-config"
6SECTION = "console/utils"
7
8LICENSE = "GPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
10
11DEPENDS = "glib-2.0"
12DEPENDS_class-native = ""
13DEPENDS_class-nativesdk = ""
14
15SRCREV = "5914edfe9604abfedd220103cbac382fc4d268bb"
16PV = "0.29+git${SRCPV}"
17SRC_URI = "git://anongit.freedesktop.org/pkg-config"
18
19S = "${WORKDIR}/git"
20
21inherit autotools
22
23EXTRA_OECONF = "--without-internal-glib"
24EXTRA_OECONF_class-native = "--with-internal-glib"
25EXTRA_OECONF_class-nativesdk = "--with-internal-glib"
26
27acpaths = "-I ."
28
29BBCLASSEXTEND = "native nativesdk"
30
31# Set an empty dev package to ensure the base PN package gets
32# the pkg.m4 macros, pkgconfig does not deliver any other -dev
33# files.
34FILES_${PN}-dev = ""
35FILES_${PN} += "${datadir}/aclocal/pkg.m4"
36
37# When using the RPM generated automatic package dependencies, some packages
38# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by
39# specifying an appropriate provide.
40RPROVIDES_${PN} += "pkgconfig(pkg-config)"
41
42# Install a pkg-config-native wrapper that will use the native sysroot instead
43# of the MACHINE sysroot, for using pkg-config when building native tools.
44do_install_append_class-native () {
45 sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \
46 -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \
47 < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native
48 install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native
49}
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
index eaa511a8b7..d34f608f11 100644
--- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
+++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
@@ -1,6 +1,53 @@
1require pkgconfig.inc 1SUMMARY = "Helper tool used when compiling"
2DESCRIPTION = "pkg-config is a helper tool used when compiling applications and libraries. It helps determined \
3the correct compiler/link options. It is also language-agnostic."
4HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
5BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=pkg-config"
6SECTION = "console/utils"
2 7
3SRC_URI += " \ 8LICENSE = "GPLv2+"
4 file://pkg-config-native.in \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5 file://fix-glib-configure-libtool-usage.patch \ 10
11DEPENDS = "glib-2.0"
12DEPENDS_class-native = ""
13DEPENDS_class-nativesdk = ""
14
15SRCREV = "5914edfe9604abfedd220103cbac382fc4d268bb"
16PV = "0.29+git${SRCPV}"
17
18SRC_URI = "git://anongit.freedesktop.org/pkg-config \
19 file://pkg-config-native.in \
20 file://fix-glib-configure-libtool-usage.patch \
6 " 21 "
22
23S = "${WORKDIR}/git"
24
25inherit autotools
26
27EXTRA_OECONF = "--without-internal-glib"
28EXTRA_OECONF_class-native = "--with-internal-glib"
29EXTRA_OECONF_class-nativesdk = "--with-internal-glib"
30
31acpaths = "-I ."
32
33BBCLASSEXTEND = "native nativesdk"
34
35# Set an empty dev package to ensure the base PN package gets
36# the pkg.m4 macros, pkgconfig does not deliver any other -dev
37# files.
38FILES_${PN}-dev = ""
39FILES_${PN} += "${datadir}/aclocal/pkg.m4"
40
41# When using the RPM generated automatic package dependencies, some packages
42# will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by
43# specifying an appropriate provide.
44RPROVIDES_${PN} += "pkgconfig(pkg-config)"
45
46# Install a pkg-config-native wrapper that will use the native sysroot instead
47# of the MACHINE sysroot, for using pkg-config when building native tools.
48do_install_append_class-native () {
49 sed -e "s|@PATH_NATIVE@|${PKG_CONFIG_PATH}|" \
50 -e "s|@LIBDIR_NATIVE@|${PKG_CONFIG_LIBDIR}|" \
51 < ${WORKDIR}/pkg-config-native.in > ${B}/pkg-config-native
52 install -m755 ${B}/pkg-config-native ${D}${bindir}/pkg-config-native
53}