diff options
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib.inc')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index f645ed6f0cf..6dab19283c8 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -39,8 +39,9 @@ PACKAGECONFIG ??= "system-pcre libmount" PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre" PACKAGECONFIG[libmount] = "--enable-libmount,--disable-libmount,util-linux" PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native" +PACKAGECONFIG[libelf] = "--enable-libelf,--disable-libelf,elfutils" -CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" +CORECONF = "--disable-dtrace --disable-fam --disable-systemtap" PRINTF = "--enable-included-printf=no" PRINTF_darwin = "--enable-included-printf=yes" @@ -86,10 +87,10 @@ ARM_INSTRUCTION_SET_armv5 = "arm" CPPFLAGS_append_class-target_mips16e = " -DNVALGRIND=1" # GLib generally requires gettext to be present so for USE_NLS to yes. For -# native builds as i18n is disabled globally we can tell it to use a fake msgfmt. +# native builds as i18n is disabled globally we have to add a gettext-native dependency. USE_NLS_class-target = "yes" USE_NLS_class-nativesdk = "yes" -CACHED_CONFIGUREVARS_append_class-native = " ac_cv_path_MSGFMT=/bin/false" +DEPENDS_append_class-native = " gettext-native" EXEEXT = "" EXEEXT_mingw32 = ".exe" @@ -116,7 +117,7 @@ do_install_append () { do_install_append_class-target () { # Tests are only installed on targets, not native builds. Separating this out - # keeps glib-2.0-native from depending on ${DISTRO_FEATURES} + # keeps glib-2.0-native from depending on DISTRO_FEATURES if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ]; then if ${@bb.utils.contains("DISTRO_FEATURES", "x11", "false", "true", d)}; then rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test |