From 76b815514f4d4c6703d4369b50f816a2a99e0abc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 22:40:02 +0200 Subject: [PATCH] binutils: use the new gettext logic This commit switches to use the new gettext logic, which involves: - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies on gettext/host-gettext - using TARGET_NLS_LIBS to force linking against libintl. This wasn't done so far, but is needed for the build to work, because uClibc now has a stub gettext implementation, which is mistaken as being the full gettext implementation by the configure script - dropping BR2_PACKAGE_GETTEXT selection Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in | 1 - package/binutils/binutils.mk | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in b/package/binutils/Config.in index 360dd5e3b2..e17a8ec65a 100644 --- a/package/binutils/Config.in +++ b/package/binutils/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_BINUTILS bool "binutils" depends on !BR2_nios2 depends on BR2_USE_WCHAR - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Install binutils on the target diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 0dc20a082d..c64ec47292 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -24,7 +24,8 @@ BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.bz2 BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS)) BINUTILS_INSTALL_STAGING = YES -BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) +BINUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +BINUTILS_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS) BINUTILS_LICENSE = GPL-3.0+, libiberty LGPL-2.1+ BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB -- 2.30.2