bslathi19/buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quota: use the new gettext logic

Browse Source 
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 <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni
2017-07-03 23:16:03 +02:00
parent bf216e48e1
commit a18a9c8a72
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/quota/Config.in
View File

@@ -3,7 +3,6 @@ config BR2_PACKAGE_QUOTA
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc 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 select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
help help
Implementation of the disk quota system. Implementation of the disk quota system.

8
package/quota/quota.mk
View File

@@ -6,18 +6,14 @@
QUOTA_VERSION = 4.01 QUOTA_VERSION = 4.01
QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) 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_AUTORECONF = YES
QUOTA_LICENSE = GPL-2.0+ QUOTA_LICENSE = GPL-2.0+
QUOTA_CONF_OPTS = --disable-strip-binaries QUOTA_CONF_OPTS = --disable-strip-binaries
QUOTA_LIBS = $(TARGET_NLS_LIBS)
QUOTA_CFLAGS = $(TARGET_CFLAGS) QUOTA_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
QUOTA_DEPENDENCIES += gettext
QUOTA_LIBS += -lintl
endif
ifeq ($(BR2_PACKAGE_E2FSPROGS),y) ifeq ($(BR2_PACKAGE_E2FSPROGS),y)
QUOTA_DEPENDENCIES += e2fsprogs QUOTA_DEPENDENCIES += e2fsprogs
QUOTA_CONF_OPTS += --enable-ext2direct QUOTA_CONF_OPTS += --enable-ext2direct