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

 - dropping BR2_PACKAGE_GETTEXT selection

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

diff --git a/package/clamav/Config.in b/package/clamav/Config.in
index a962103208d04a89d3bf322a8a3cebe90cccccec..bc934ea45223c334e4d5538e8f624f9c0f894f9b 100644 (file)
--- a/package/clamav/Config.in
+++ b/package/clamav/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_CLAMAV
        bool "clamav"
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBTOOL
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_ZLIB

diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk
index 23dee0a818f240fe3d9b52902e910396cc56c438..5429abb9893e74d75c6cba31fa24e1c19d99d10d 100644 (file)
--- a/package/clamav/clamav.mk
+++ b/package/clamav/clamav.mk
@@ -15,7 +15,7 @@ CLAMAV_DEPENDENCIES = \
        libtool \
        openssl \
        zlib \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+       $(TARGET_NLS_DEPENDENCIES)
 
 # mmap cannot be detected when cross-compiling, needed for mempool support
 CLAMAV_CONF_ENV = \