package/rhash: bump version to 1.4.0

Project switched license to BSD Zero Clause License:
007a303dac

Add RHASH_CONFIGURE_CMDS after upstream added a configure script:
cdaf438622

Make target install-headers was renamed to install-lib-headers:
5184f57ed8

Make target install-shared was removed, use build-install-binary
instead:
cdaf438622

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2020-11-06 21:26:31 +01:00 committed by Thomas Petazzoni
parent fcee4254aa
commit ead2afda13
2 changed files with 27 additions and 18 deletions

View File

@ -1,6 +1,5 @@
# From https://sourceforge.net/projects/rhash/files/rhash/1.3.5/ # From https://sourceforge.net/projects/rhash/files/rhash/1.4.0/
md5 f586644019c10c83c6b6835de4b99e74 rhash-1.3.5-src.tar.gz sha1 3db1e87a31c77ca2fa5507db7932ef92e9eb5148 rhash-1.4.0-src.tar.gz
sha1 990c9a0135afe48dee4ce1dbf83578e44735f302 rhash-1.3.5-src.tar.gz
# Locally calculated # Locally calculated
sha256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e rhash-1.3.5-src.tar.gz sha256 2ea39540f5c580da0e655f7b483c19e0d31506aed4202d88e8459fa7aeeb8861 rhash-1.4.0-src.tar.gz
sha256 8cf876d3406a2eed6c17ae804c8958bd78d3a0f63c30d6e2e789ab575e9fde40 COPYING sha256 953e55838353335148c90b5a38a4894292680b1d4c37228ffddddbf18ce54bf5 COPYING

View File

@ -4,26 +4,36 @@
# #
################################################################################ ################################################################################
RHASH_VERSION = 1.3.5 RHASH_VERSION = 1.4.0
RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz
RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION)
RHASH_LICENSE = MIT RHASH_LICENSE = 0BSD
RHASH_LICENSE_FILES = COPYING RHASH_LICENSE_FILES = COPYING
RHASH_INSTALL_STAGING = YES RHASH_INSTALL_STAGING = YES
RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS)
RHASH_ADDCFLAGS = $(if $(BR2_SYSTEM_ENABLE_NLS),-DUSE_GETTEXT)
ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
RHASH_DEPENDENCIES += openssl RHASH_CONF_OPTS += --disable-gettext
RHASH_ADDCFLAGS += -DOPENSSL_RUNTIME -rdynamic else
RHASH_ADDLDFLAGS += -ldl RHASH_CONF_OPTS += --enable-gettext
endif endif
RHASH_MAKE_OPTS = \ ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx)
ADDCFLAGS="$(RHASH_ADDCFLAGS)" \ RHASH_CONF_OPTS += --enable-openssl
ADDLDFLAGS="$(RHASH_ADDLDFLAGS)" \ RHASH_DEPENDENCIES += openssl
PREFIX="/usr" else
RHASH_CONF_OPTS += --disable-openssl
endif
define RHASH_CONFIGURE_CMDS
(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure \
--prefix=/usr \
--cc=$(TARGET_CC) \
--target=$(GNU_TARGET_NAME) \
$(RHASH_CONF_OPTS) \
)
endef
ifeq ($(BR2_SHARED_LIBS),y) ifeq ($(BR2_SHARED_LIBS),y)
RHASH_BUILD_TARGETS = lib-shared build-shared RHASH_BUILD_TARGETS = lib-shared build-shared
@ -44,13 +54,13 @@ endef
define RHASH_INSTALL_STAGING_CMDS define RHASH_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/librhash \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/librhash \
DESTDIR="$(STAGING_DIR)" $(RHASH_MAKE_OPTS) $(RHASH_INSTALL_TARGETS) \ DESTDIR="$(STAGING_DIR)" $(RHASH_MAKE_OPTS) $(RHASH_INSTALL_TARGETS) \
install-headers install-lib-headers
endef endef
ifeq ($(BR2_PACKAGE_RHASH_BIN),y) ifeq ($(BR2_PACKAGE_RHASH_BIN),y)
define RHASH_INSTALL_TARGET_RHASH_BIN define RHASH_INSTALL_TARGET_RHASH_BIN
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
DESTDIR="$(TARGET_DIR)" $(RHASH_MAKE_OPTS) install-shared DESTDIR="$(TARGET_DIR)" $(RHASH_MAKE_OPTS) build-install-binary
endef endef
endif endif