aboutsummaryrefslogtreecommitdiff
path: root/package/axel/axel.mk
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-03 17:08:25 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-05 01:27:24 +0200
commit8e41fd0c4cdf40075674c1e527c2776597f6bc36 (patch)
tree05f373a5c9d0c237b944b6e9fd243d157b834a54 /package/axel/axel.mk
parent218bcaeb8d356b3420d203c205f0dd5bab283552 (diff)
downloadbuildroot-8e41fd0c4cdf40075674c1e527c2776597f6bc36.tar.gz
buildroot-8e41fd0c4cdf40075674c1e527c2776597f6bc36.tar.bz2
axel: 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 Note that -lpthread is no longer needed for -lintl, but axel uses pthread directly anyway, so we have to keep -lpthread as part of LDFLAGS. Finally, we now use BR2_SYSTEM_ENABLE_NLS to decide whether NLS support should be enabled or not. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/axel/axel.mk')
-rw-r--r--package/axel/axel.mk12
1 files changed, 3 insertions, 9 deletions
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index e89a946ed3..60bf5e4a61 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -8,16 +8,10 @@ AXEL_VERSION = 2.4
AXEL_SITE = http://sources.buildroot.net
AXEL_LICENSE = GPL-2.0+
AXEL_LICENSE_FILES = COPYING
+AXEL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+AXEL_LDFLAGS = -lpthread $(TARGET_NLS_LIBS)
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-AXEL_DEPENDENCIES += gettext
-AXEL_LDFLAGS += -lintl
-endif
-
-# -lintl may use symbols from -lpthread
-AXEL_LDFLAGS += -lpthread
-
-ifneq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
AXEL_DISABLE_I18N = --i18n=0
endif