flex: 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/flex/Config.in b/package/flex/Config.in
index 76e8bc7bc8b6dc6c176f2b3933d67e373caea70d..33d123d73269484c9d7a680c83a86f77d65d4287 100644 (file)
--- a/package/flex/Config.in
+++ b/package/flex/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_FLEX
        bool "flex"
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          A fast lexical analyser generator. A tool for generating
          programs that perform pattern-matching on text.

diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 905621ea3cb90f722ec48ef6e89f904430ae0726..b78269952eb14f418adc3f323263646b782f26ce 100644 (file)
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -9,8 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163
 FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING
-FLEX_DEPENDENCIES = \
-       $(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4
+FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4
 FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
 HOST_FLEX_DEPENDENCIES = host-m4