Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

umurmur: Switch to CMake

Browse source 
Fixed license information.

Added HTTPS to URL.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-09-25 21:09:04 -07:00
parent f95b46a179
commit 0c6fcf6ed0
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
net/umurmur/Makefile
View file

@ -12,16 +12,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/umurmur/umurmur/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/umurmur/umurmur/tar.gz/$(PKG_VERSION)?
PKG_HASH:=e77b7b6616768f4a1c07442afe49a772692f667b00c23cc85909d4dd0ce206d2 PKG_HASH:=e77b7b6616768f4a1c07442afe49a772692f667b00c23cc85909d4dd0ce206d2
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
PKG_MAINTAINER:=Martin Johansson <martin@fatbob.nu> PKG_MAINTAINER:=Martin Johansson <martin@fatbob.nu>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/umurmur/Default define Package/umurmur/Default
SECTION:=net SECTION:=net
@ -29,7 +27,7 @@ define Package/umurmur/Default
SUBMENU:=Instant Messaging SUBMENU:=Instant Messaging
TITLE:=uMurmur TITLE:=uMurmur
DEPENDS:=+libconfig +libprotobuf-c DEPENDS:=+libconfig +libprotobuf-c
URL:=http://umurmur.net URL:=https://umurmur.net
endef endef
define Package/umurmur/Default/description define Package/umurmur/Default/description
@ -60,13 +58,6 @@ define Package/umurmur-mbedtls/description
Uses the mbed TLS library for SSL and crypto. Uses the mbed TLS library for SSL and crypto.
endef endef
define Build/Compile
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
$(MAKE) -C $(PKG_BUILD_DIR)/src all
endef
define Package/umurmur-openssl/conffiles define Package/umurmur-openssl/conffiles
/etc/umurmur.conf /etc/umurmur.conf
endef endef
@ -75,7 +66,7 @@ Package/umurmur-mbedtls/conffiles = $(Package/umurmur-openssl/conffiles)
define Package/umurmur-openssl/install define Package/umurmur-openssl/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/umurmurd $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/umurmurd $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/ $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwrt/files/umurmur.conf $(1)/etc/
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
@ -85,14 +76,21 @@ endef
Package/umurmur-mbedtls/install = $(Package/umurmur-openssl/install) Package/umurmur-mbedtls/install = $(Package/umurmur-openssl/install)
ifeq ($(BUILD_VARIANT),openssl) CMAKE_OPTIONS += \
CONFIGURE_ARGS += \ -DLIBCONFIG_INCLUDE_DIR="$(STAGING_DIR)/include" \
--with-ssl=openssl -DLIBCONFIG_LIBRARIES="$(STAGING_DIR)/lib" \
endif -DLIBCONFIG_LIB_DIR="$(STAGING_DIR)/lib" \
-DPROTOBUFC_INCLUDE_DIR="$(STAGING_DIR)/include" \
-DPROTOBUFC_LIBRARIES="$(STAGING_DIR)/lib" \
-DPROTOBUFC_LIB_DIR="$(STAGING_DIR)/lib"
ifeq ($(BUILD_VARIANT),mbedtls) ifeq ($(BUILD_VARIANT),openssl)
CONFIGURE_ARGS += \ CMAKE_OPTIONS += -DSSL=openssl
--with-ssl=mbedtls else
CMAKE_OPTIONS += -DSSL=mbedtls \
-DMBEDTLS_INCLUDE_DIR="$(STAGING_DIR)/include/mbedtls" \
-DMBEDTLS_LIBRARIES="$(STAGING_DIR)/lib" \
-DMBEDTLS_LIB_DIR="$(STAGING_DIR)/lib"
endif endif
$(eval $(call BuildPackage,umurmur-openssl)) $(eval $(call BuildPackage,umurmur-openssl))