gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libglib2: fix build with/without locale support

Browse Source 
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.
This commit is contained in:
Peter Korsgaard 2008-08-31 20:23:41 +00:00
parent 525bab78ad
commit d5007ac67b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/libglib2/Config.in
View File

@ -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.

6
package/libglib2/libglib2.mk
View File

@ -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))