diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-08-31 20:23:41 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-08-31 20:23:41 +0000 |
| commit | d5007ac67b7df21bc3d6b5ebd2453a420354425b (patch) | |
| tree | e2c3f7fd82f4b9904d85df80c5d80510d64db9f8 | |
| parent | 525bab78ad6445283c61b1a8b3112d79903af7ed (diff) | |
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.
| -rw-r--r-- | package/libglib2/Config.in | 3 | ||||
| -rw-r--r-- | package/libglib2/libglib2.mk | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index f35723b2e..be0a351b6 100644 --- 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 d176236db..ba77399d1 100644 --- 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)) |