Browse Source

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.
Peter Korsgaard 17 năm trước cách đây
mục cha
commit
d5007ac67b
2 tập tin đã thay đổi với 6 bổ sung3 xóa
  1. 1 2
      package/libglib2/Config.in
  2. 5 1
      package/libglib2/libglib2.mk

+ 1 - 2
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.

+ 5 - 1
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))