diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 16:59:50 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:27:24 +0200 |
| commit | e0a46903ee7de81f6807725c2c523d238cab3f0d (patch) | |
| tree | aeb1ab94a49c840a21e2919cd52c5210a8bf2a61 | |
| parent | 388bb94b3d2d6d3acb8b4cdce22d6f0ca3dd2ba6 (diff) | |
| download | buildroot-e0a46903ee7de81f6807725c2c523d238cab3f0d.tar.gz buildroot-e0a46903ee7de81f6807725c2c523d238cab3f0d.zip | |
dos2unix: use 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
In addition, we now use BR2_SYSTEM_ENABLE_NLS instead of
BR2_ENABLE_LOCALE to decide if NLS support should be enabled or
disabled.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/dos2unix/Config.in | 1 | ||||
| -rw-r--r-- | package/dos2unix/dos2unix.mk | 15 |
2 files changed, 7 insertions, 9 deletions
diff --git a/package/dos2unix/Config.in b/package/dos2unix/Config.in index 6945f52fad..cfb5ba4b79 100644 --- a/package/dos2unix/Config.in +++ b/package/dos2unix/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_DOS2UNIX bool "dos2unix" depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help dos2unix converts text file line endings between CRLF and LF diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 3540ec8562..87525fb468 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -8,19 +8,18 @@ DOS2UNIX_VERSION = 7.3.4 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt -DOS2UNIX_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) +DOS2UNIX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_BUSYBOX),busybox) \ + $(TARGET_NLS_DEPENDENCIES) -ifeq ($(BR2_ENABLE_LOCALE),y) -DOS2UNIX_DEPENDENCIES += host-gettext +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) +DOS2UNIX_MAKE_OPTS += ENABLE_NLS=1 +DOS2UNIX_MAKE_OPTS += LIBS_EXTRA=$(TARGET_NLS_LIBS) else +# Should be defined to empty to disable NLS support DOS2UNIX_MAKE_OPTS += ENABLE_NLS= endif -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -DOS2UNIX_DEPENDENCIES += gettext -DOS2UNIX_MAKE_OPTS += LIBS_EXTRA=-lintl -endif - ifeq ($(BR2_USE_WCHAR),) DOS2UNIX_MAKE_OPTS += UCS= endif |
