diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 23:06:55 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:28:46 +0200 |
| commit | b08bf566e3619e409542ed189a4c5cbea52ec5f1 (patch) | |
| tree | cf99a1891e02ad3d53334f7f95c2bf501dfbe8d3 /package/newt | |
| parent | 44f38e53df5fa998507447267ad80e1b06280f4d (diff) | |
| download | buildroot-b08bf566e3619e409542ed189a4c5cbea52ec5f1.tar.gz buildroot-b08bf566e3619e409542ed189a4c5cbea52ec5f1.zip | |
newt: 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/newt')
| -rw-r--r-- | package/newt/Config.in | 1 | ||||
| -rw-r--r-- | package/newt/newt.mk | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/package/newt/Config.in b/package/newt/Config.in index a2216155bf..c59af1cd19 100644 --- a/package/newt/Config.in +++ b/package/newt/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_NEWT depends on !BR2_STATIC_LIBS # unconditionally creates .so select BR2_PACKAGE_SLANG select BR2_PACKAGE_POPT - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Programming library for color text mode, widget based user interfaces. diff --git a/package/newt/newt.mk b/package/newt/newt.mk index 1764bbcea8..456dd699c9 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -7,8 +7,10 @@ NEWT_VERSION = 0.52.19 NEWT_SITE = https://pagure.io/releases/newt NEWT_INSTALL_STAGING = YES -NEWT_DEPENDENCIES = popt slang \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) +NEWT_DEPENDENCIES = popt slang $(TARGET_NLS_DEPENDENCIES) +# Force to use libintl, otherwise it finds gettext functions in the C +# library, and does not link against libintl. +NEWT_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) NEWT_CONF_OPTS = --without-python --without-tcl NEWT_MAKE = $(MAKE1) NEWT_LICENSE = GPL-2.0 |
