summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-01-10 17:28:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-11 10:26:07 +0000
commit7ba16edc3ceac32b9d9395fd8e79c1edd2290e83 (patch)
tree68eae1b36c3f47e5ad22bf41b2a16b3108143a7e
parent0f49d9182f9a6204399c0946b9e9ae64ad3c0838 (diff)
downloadpoky-7ba16edc3ceac32b9d9395fd8e79c1edd2290e83.tar.gz
glib-2.0: rationalise build dependencies
nativesdk-glib-2.0 doesn't build-depend on nativesdk-gettext, but all variations need to depend on gettext-native as they need msgfmt (so gettext-minimal-native isn't an option). Also add virtual/libintl as glib explicitly needs this. Generally this is provided by glibc but some platforms (such as MinGW) don't. (From OE-Core rev: 8b0ca0cb54c91611213556bdb99316d5e7ac5b3b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index cfeb48a536..b374f6bb2e 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "GLib is a general-purpose utility library, which provides many us
3HOMEPAGE = "https://developer.gnome.org/glib/" 3HOMEPAGE = "https://developer.gnome.org/glib/"
4 4
5# pcre is under BSD; 5# pcre is under BSD;
6# docs/reference/COPYING is with a 'public domai'-like license! 6# docs/reference/COPYING is with a 'public domain'-like license!
7LICENSE = "LGPLv2.1+ & BSD & PD" 7LICENSE = "LGPLv2.1+ & BSD & PD"
8LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
9 file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ 9 file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \
@@ -19,10 +19,13 @@ CVE_PRODUCT = "glib"
19 19
20BBCLASSEXTEND = "native nativesdk" 20BBCLASSEXTEND = "native nativesdk"
21 21
22DEPENDS = "virtual/libiconv libffi zlib glib-2.0-native" 22DEPENDS = "glib-2.0-native \
23DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' dbus', '', d)}" 23 gettext-native \
24DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" 24 virtual/libintl \
25DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib glib-2.0-native" 25 virtual/libiconv \
26 libffi \
27 zlib \
28 ${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus', '', d)}"
26 29
27PACKAGES += "${PN}-codegen ${PN}-utils" 30PACKAGES += "${PN}-codegen ${PN}-utils"
28 31