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