NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gettext: build libintl unconditionally for uClibc/musl

Browse Source 
Only the initial patches of the gettext series have been applied, and
a bisectability problem has arised: when BR2_SYSTEM_ENABLE_NLS is
disabled, which is the default, gettext no longer builds libintl.

However, since packages have not yet been updated to the new gettext
logic, they still try to link against libintl, because they rely on
BR2_NEEDS_GETTEXT/BR2_NEEDS_GETTEXT_IF_LOCALE, which are true.

So, as a temporary measure, we adjust the gettext package so that it
unconditionally builds libintl for uClibc/musl, even when NLS is
disabled. This commit will be reverted once all packages have been
fixed.

Fixes:

  http://autobuild.buildroot.net/results/a4cf71c34dcc5c750ea87a16014c2cb2d28cdebd/
  (elfutils)

  http://autobuild.buildroot.net/results/cb9ae18295b21b3f9399be6edd82273add375656/
  (linux-pam)

  http://autobuild.buildroot.net/results/4225e5dfb6bcf590d9c1068112472ee82bc87d6b/
  (alsa-utils)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-05 00:11:10 +02:00
parent ac41572e66
commit 431d00abc1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gettext/Config.in
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 if BR2_SYSTEM_ENABLE_NLS
default y
endif

2
package/gettext/gettext.mk
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
GETTEXT_CONF_OPTS += --with-included-gettext --enable-nls
else
GETTEXT_CONF_OPTS += --without-included-gettext
endif