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

 - using TARGET_NLS_LIBS to force linking against libintl

 - dropping BR2_PACKAGE_GETTEXT selection

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

diff --git a/package/vdr/Config.in b/package/vdr/Config.in
index d32c642710f44dbfd32a1914459c2b8405ce456a..65117f5461b0e23881f3dd8470b6db9f9e01347c 100644 (file)
--- a/package/vdr/Config.in
+++ b/package/vdr/Config.in
@@ -7,7 +7,6 @@ config BR2_PACKAGE_VDR
        depends on !BR2_TOOLCHAIN_USES_MUSL # _nl_msg_cat_cntr
        depends on BR2_USE_MMU # fork()
        depends on BR2_USE_WCHAR
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
        select BR2_PACKAGE_FONTCONFIG
        select BR2_PACKAGE_FREETYPE
        select BR2_PACKAGE_JPEG

diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk
index 6c4656624e8aa57124c342a70c1c45a6a5c61cae..242c5798d141cd206faed99a727974b54a6c15d0 100644 (file)
--- a/package/vdr/vdr.mk
+++ b/package/vdr/vdr.mk
@@ -14,7 +14,8 @@ VDR_DEPENDENCIES = \
        freetype \
        fontconfig \
        jpeg \
-       libcap
+       libcap \
+       $(TARGET_NLS_DEPENDENCIES)
 
 VDR_INCLUDE_DIRS = -I$(STAGING_DIR)/usr/include/freetype2
 VDR_MAKE_FLAGS = \
@@ -22,11 +23,7 @@ VDR_MAKE_FLAGS = \
        PLUGINLIBDIR=/usr/lib/vdr \
        PREFIX=/usr \
        VIDEODIR=/var/lib/vdr
-
-ifeq ($(BR2_NEEDS_GETTEXT),y)
-VDR_DEPENDENCIES += gettext
-VDR_LDFLAGS += -lintl
-endif
+VDR_LDFLAGS = $(TARGET_NLS_LIBS)
 
 ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
 VDR_DEPENDENCIES += libfribidi