@@ -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
@@ -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)
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 <thomas.petazzoni@free-electrons.com> --- package/ding-libs/Config.in | 6 ------ package/ding-libs/ding-libs.mk | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)