Revert "gettext: build libintl unconditionally for uClibc/musl"

This reverts commit 431d00abc1, which in
fact doesn't work for static linking situations, as can be seen in:

  http://autobuild.buildroot.net/results/a6a4039f23a6fbd2bdb5938bcef097a7310452cc/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-05 01:25:59 +02:00
parent 96fa6b4ea1
commit de291b06a9
2 changed files with 2 additions and 2 deletions

View File

@ -17,7 +17,7 @@ if BR2_PACKAGE_GETTEXT
config BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL
bool
depends on !BR2_TOOLCHAIN_HAS_FULL_GETTEXT
default y
default y if BR2_SYSTEM_ENABLE_NLS
endif

View File

@ -42,7 +42,7 @@ HOST_GETTEXT_CONF_OPTS = \
# Force the build of libintl, even if the C library provides a stub
# gettext implementation
ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
GETTEXT_CONF_OPTS += --with-included-gettext --enable-nls
GETTEXT_CONF_OPTS += --with-included-gettext
else
GETTEXT_CONF_OPTS += --without-included-gettext
endif