diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 22:46:28 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:27:25 +0200 |
| commit | 8c1bfe6d42e619b536afac4cf9ffa6122e3b4ac7 (patch) | |
| tree | f536680a79f3449516e7daafe611e8215d7028bf /package/elfutils | |
| parent | 2171d073156afc370d7298c1ec464424016e5243 (diff) | |
| download | buildroot-8c1bfe6d42e619b536afac4cf9ffa6122e3b4ac7.tar.gz buildroot-8c1bfe6d42e619b536afac4cf9ffa6122e3b4ac7.zip | |
elfutils: 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
- dropping BR2_PACKAGE_GETTEXT selection
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/elfutils')
| -rw-r--r-- | package/elfutils/Config.in | 1 | ||||
| -rw-r--r-- | package/elfutils/elfutils.mk | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in index 32283198e6..ad86c313d6 100644 --- a/package/elfutils/Config.in +++ b/package/elfutils/Config.in @@ -14,7 +14,6 @@ config BR2_PACKAGE_ELFUTILS depends on !BR2_bfin select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT help Libraries/utilities to handle ELF objects (drop in replacement for libelf). diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index e43d0367ad..5570a3b37f 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -10,7 +10,7 @@ ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3 -ELFUTILS_DEPENDENCIES = zlib +ELFUTILS_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz # We patch configure.ac @@ -40,13 +40,8 @@ ELFUTILS_CONF_ENV += \ CFLAGS="$(ELFUTILS_CFLAGS)" \ CPPFLAGS="$(ELFUTILS_CPPFLAGS)" -ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) - -# Unconditionnally requires gettext. -ifeq ($(BR2_NEEDS_GETTEXT),y) -ELFUTILS_DEPENDENCIES += gettext -ELFUTILS_LDFLAGS += -lintl -endif +ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \ + $(TARGET_NLS_LIBS) ELFUTILS_CONF_ENV += \ LDFLAGS="$(ELFUTILS_LDFLAGS)" |
