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>
This commit is contained in:
Thomas Petazzoni 2017-07-03 23:16:58 +02:00
parent a18a9c8a72
commit abf3e8f320
2 changed files with 3 additions and 7 deletions

View File

@ -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,

View File

@ -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