mcrypt: 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

 - dropping BR2_PACKAGE_GETTEXT selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/mcrypt/Config.in b/package/mcrypt/Config.in
index 58567cd7515c7f8346b5b9444902ce7b043b7b2d..ab2888bb178f6fb694211ce8efc288ee89943609 100644 (file)
--- a/package/mcrypt/Config.in
+++ b/package/mcrypt/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_MCRYPT
        depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_LIBMCRYPT
        select BR2_PACKAGE_LIBMHASH
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          MCrypt is a replacement for the old crypt() package and crypt(1)
          command, with extensions.

diff --git a/package/mcrypt/mcrypt.mk b/package/mcrypt/mcrypt.mk
index 03a17196aec82e0f7a8979baef8e8bc7da4460e3..f98895f40136c300b11ca97d3e5ca4033054d81e 100644 (file)
--- a/package/mcrypt/mcrypt.mk
+++ b/package/mcrypt/mcrypt.mk
@@ -9,7 +9,7 @@ MCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/MCrypt/$(MCRYPT_VE
 MCRYPT_DEPENDENCIES = libmcrypt libmhash \
        $(if $(BR2_PACKAGE_ZLIB),zlib) \
        $(if $(BR2_PACKAGE_LIBICONV),libiconv) \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+       $(TARGET_NLS_DEPENDENCIES)
 MCRYPT_CONF_OPTS = --with-libmcrypt-prefix=$(STAGING_DIR)/usr
 MCRYPT_LICENSE = GPL-3.0
 MCRYPT_LICENSE_FILES = COPYING