From 24c6a63367a52eb43322a930f20f0d1087bdd136 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 22:53:04 +0200 Subject: [PATCH] libuio: 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 --- package/libuio/Config.in | 1 - package/libuio/libuio.mk | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/libuio/Config.in b/package/libuio/Config.in index a96df54b12..97be1e3d57 100644 --- a/package/libuio/Config.in +++ b/package/libuio/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBUIO bool "libuio" select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help libuio is a light-weight C programming library to handle UIO (Userspace I/O) device discovery and binding task. diff --git a/package/libuio/libuio.mk b/package/libuio/libuio.mk index bdd29e35fa..8f72253add 100644 --- a/package/libuio/libuio.mk +++ b/package/libuio/libuio.mk @@ -10,6 +10,8 @@ LIBUIO_SITE = $(call github,Linutronix,libuio,$(LIBUIO_VERSION)) LIBUIO_LICENSE = LGPL-2.1 (library), GPL-2.0 (programs) LIBUIO_LICENSE_FILES = COPYING LIBUIO_CONF_OPTS = --with-glib=no --without-werror +LIBUIO_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +LIBUIO_LIBS = $(TARGET_NLS_LIBS) LIBUIO_INSTALL_STAGING = YES # Fetched from github, no pre-generated configure script provided @@ -24,13 +26,6 @@ LIBUIO_DEPENDENCIES += argp-standalone LIBUIO_LIBS += -largp endif -# libuio pulls in libintl if needed, so ensure we also -# link against it, otherwise static linking fails -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -LIBUIO_DEPENDENCIES += gettext -LIBUIO_LIBS += -lintl -endif - LIBUIO_CONF_ENV += LIBS="$(LIBUIO_LIBS)" $(eval $(autotools-package)) -- 2.30.2