From 7426b582f6aedef449f398b1f815fb22978687ef Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 23:21:14 +0200 Subject: [PATCH] util-linux: 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 Reviewed-by: Carlos Santos --- package/util-linux/Config.in | 1 - package/util-linux/util-linux.mk | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 6ba239efb0..cba590c4f9 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -1,6 +1,5 @@ menuconfig BR2_PACKAGE_UTIL_LINUX bool "util-linux" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Various useful/essential linux libraries and utilities. diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index d55ee7cb30..61e3e63c10 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -17,7 +17,7 @@ UTIL_LINUX_AUTORECONF = YES UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid) UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 UTIL_LINUX_INSTALL_STAGING = YES -UTIL_LINUX_DEPENDENCIES = host-pkgconf +UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) # uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support # (used in logger.c), and the common default is N. UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \ @@ -25,6 +25,7 @@ UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \ UTIL_LINUX_CONF_OPTS += \ --disable-rpath \ --disable-makeinstall-chown +UTIL_LINUX_LIBS = $(TARGET_NLS_LIBS) # system depends on util-linux so we enable systemd support # (which needs systemd to be installed) @@ -62,11 +63,6 @@ endif UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses endif -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -UTIL_LINUX_DEPENDENCIES += gettext -UTIL_LINUX_LIBS += -lintl -endif - ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) UTIL_LINUX_DEPENDENCIES += libcap-ng endif -- 2.30.2