From 9494e46a07d82ff781a92af0b63676f15a5ecb85 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 22:41:25 +0200 Subject: [PATCH] ding-libs: 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 The BR2_USE_WCHAR dependency was only needed for gettext. But now, we no longer need gettext unconditionally, so this dependency on BR2_USE_WCHAR is removed. Signed-off-by: Thomas Petazzoni --- package/ding-libs/Config.in | 6 ------ package/ding-libs/ding-libs.mk | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/package/ding-libs/Config.in b/package/ding-libs/Config.in index d397f291f0..6dc2a80f82 100644 --- a/package/ding-libs/Config.in +++ b/package/ding-libs/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_DING_LIBS bool "ding-libs" - depends on BR2_USE_WCHAR || !BR2_NEEDS_GETTEXT - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help The ding-libs packages contain a set of libraries used by @@ -16,7 +14,3 @@ config BR2_PACKAGE_DING_LIBS structure (libini_config). https://git.fedorahosted.org/git/ding-libs.git - -comment "ding-libs needs a toolchain w/ wchar" - depends on BR2_NEEDS_GETTEXT - depends on !BR2_USE_WCHAR diff --git a/package/ding-libs/ding-libs.mk b/package/ding-libs/ding-libs.mk index 4b045be0b9..e9508ccf9e 100644 --- a/package/ding-libs/ding-libs.mk +++ b/package/ding-libs/ding-libs.mk @@ -8,7 +8,7 @@ DING_LIBS_VERSION = 0_4_0 DING_LIBS_SOURCE = ding_libs-$(DING_LIBS_VERSION).tar.xz DING_LIBS_SITE = https://git.fedorahosted.org/cgit/ding-libs.git/snapshot DING_LIBS_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_GETTEXT),gettext) \ + $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) DING_LIBS_INSTALL_STAGING = YES DING_LIBS_LICENSE = LGPL-3.0+ (library),GPL-3.0+ (test programs) -- 2.30.2