diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 23:16:58 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:34:17 +0200 |
| commit | abf3e8f32099a20481024a039f915449f9a746b0 (patch) | |
| tree | 693046c4464e5b6425e9327e5b18fff72683785e | |
| parent | a18a9c8a72f215cf6aa0b7fa28e00ae892e24d8e (diff) | |
| download | buildroot-abf3e8f32099a20481024a039f915449f9a746b0.tar.gz buildroot-abf3e8f32099a20481024a039f915449f9a746b0.zip | |
rhash: 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 <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
| -rw-r--r-- | package/rhash/Config.in | 1 | ||||
| -rw-r--r-- | package/rhash/rhash.mk | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/package/rhash/Config.in b/package/rhash/Config.in index 46f6ca7a9a..2ddcb00feb 100644 --- a/package/rhash/Config.in +++ b/package/rhash/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_RHASH bool "rhash" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help LibRHash is a professional, portable, thread-safe C library for computing a wide variety of hash sums, such as CRC32, diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 6cfc271ec0..53f49d8d3c 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -10,12 +10,9 @@ RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) RHASH_LICENSE = MIT RHASH_LICENSE_FILES = COPYING RHASH_INSTALL_STAGING = YES - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -RHASH_DEPENDENCIES += gettext -RHASH_ADDCFLAGS += -DUSE_GETTEXT -RHASH_ADDLDFLAGS += -lintl -endif +RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) +RHASH_ADDCFLAGS = $(if $(BR2_SYSTEM_ENABLE_NLS),-DUSE_GETTEXT) ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) RHASH_DEPENDENCIES += openssl |
