From 8b0ca0cb54c91611213556bdb99316d5e7ac5b3b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 10 Jan 2018 17:28:57 +0000 Subject: 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. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 13 ++++++++----- 1 file 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 HOMEPAGE = "https://developer.gnome.org/glib/" # pcre is under BSD; -# docs/reference/COPYING is with a 'public domai'-like license! +# docs/reference/COPYING is with a 'public domain'-like license! LICENSE = "LGPLv2.1+ & BSD & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ @@ -19,10 +19,13 @@ CVE_PRODUCT = "glib" BBCLASSEXTEND = "native nativesdk" -DEPENDS = "virtual/libiconv libffi zlib glib-2.0-native" -DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' dbus', '', d)}" -DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" -DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib glib-2.0-native" +DEPENDS = "glib-2.0-native \ + gettext-native \ + virtual/libintl \ + virtual/libiconv \ + libffi \ + zlib \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'dbus', '', d)}" PACKAGES += "${PN}-codegen ${PN}-utils" -- cgit 1.2.3-korg