deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

dos2unix: use new gettext logic

Browse source 
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>
This commit is contained in:
Thomas Petazzoni 2017-07-03 16:59:50 +02:00
parent 388bb94b3d
commit e0a46903ee
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package/dos2unix/Config.in
View file

@ -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

15
package/dos2unix/dos2unix.mk
View file

@ -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