From a18a9c8a72f215cf6aa0b7fa28e00ae892e24d8e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 23:16:03 +0200 Subject: [PATCH] quota: 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/quota/Config.in | 1 - package/quota/quota.mk | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/quota/Config.in b/package/quota/Config.in index c8ab0d7ed3..051a765570 100644 --- a/package/quota/Config.in +++ b/package/quota/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_QUOTA depends on BR2_USE_WCHAR depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC help Implementation of the disk quota system. diff --git a/package/quota/quota.mk b/package/quota/quota.mk index d3b8755293..5bd9013d6a 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -6,18 +6,14 @@ QUOTA_VERSION = 4.01 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) -QUOTA_DEPENDENCIES = host-gettext +QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) QUOTA_AUTORECONF = YES QUOTA_LICENSE = GPL-2.0+ QUOTA_CONF_OPTS = --disable-strip-binaries +QUOTA_LIBS = $(TARGET_NLS_LIBS) QUOTA_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -QUOTA_DEPENDENCIES += gettext -QUOTA_LIBS += -lintl -endif - ifeq ($(BR2_PACKAGE_E2FSPROGS),y) QUOTA_DEPENDENCIES += e2fsprogs QUOTA_CONF_OPTS += --enable-ext2direct -- 2.30.2