[Buildroot] [git commit] rhash: use the new gettext logic
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Tue Jul 4 23:34:17 UTC 2017
commit: https://git.buildroot.net/buildroot/commit/?id=abf3e8f32099a20481024a039f915449f9a746b0
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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 at free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
package/rhash/Config.in | 1 -
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 46f6ca7..2ddcb00 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 6cfc271..53f49d8 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
More information about the buildroot
mailing list