libglib2: fix build with/without locale support

Don't select BR2_ENABLE_LOCALE. Glib works without locale support in
toolchain, and packages shouldn't silently select toolchain options.

Only select libiconv if locale support isn't enabled.

diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index f35723b2e22f75d680385dbca055cfad25c6fb65..be0a351b67d25f9300a5dcab3c9d47bf12b7203a 100644 (file)
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -1,9 +1,8 @@
 config BR2_PACKAGE_LIBGLIB2
        bool "libglib2"
-       select BR2_ENABLE_LOCALE
        select BR2_PACKAGE_GETTEXT
        select BR2_PACKAGE_LIBINTL
-       select BR2_PACKAGE_LIBICONV
+       select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_PKGCONFIG
        help
          Low-level core library that forms the basis of GTK+ and GNOME.

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index d176236db353986e733124f4e9771cf46dac8039..ba77399d1d8801e83cc1f7056e8acad4bbc10bd2 100644 (file)
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -47,6 +47,10 @@ LIBGLIB2_CONF_ENV =  $(TARGET_CONFIGURE_OPTS) $(TARGET_CONFIGURE_ARGS) \
 LIBGLIB2_CONF_OPT = --enable-shared \
                --enable-static $(DISABLE_NLS)
 
-LIBGLIB2_DEPENDENCIES = uclibc gettext libintl libiconv pkgconfig
+LIBGLIB2_DEPENDENCIES = uclibc gettext libintl pkgconfig
+
+ifneq ($(BR2_ENABLE_LOCALE),y)
+LIBGLIB2_DEPENDENCIES+=libiconv
+endif
 
 $(eval $(call AUTOTARGETS,package,libglib2))