cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

transmission: Use external libminiupnpc instead of internal.

Browse Source 
The original patch that forced internal usage hid an actual issue in the build system. Replace patch with upstream one.

Also reorganized the Makefile a bit and removed some cruft.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2018-01-28 12:22:42 -08:00
parent b3710f578a
commit 1e8905176d
4 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/transmission/Makefile
+4 -17
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=transmission
PKG_VERSION:=2.93
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/transmission/transmission-releases/raw/master
@@ -37,7 +37,7 @@ endef
define Package/transmission-daemon/Default
$(call Package/transmission/template)
DEPENDS:=+libcurl +libpthread +libevent2 +librt +zlib
DEPENDS:=+libcurl +libevent2 +libminiupnpc +libpthread +librt +zlib
USERID:=transmission=224:transmission=224
endef
@@ -57,7 +57,7 @@ endef
define Package/transmission-cli/Default
$(call Package/transmission/template)
DEPENDS:=+libcurl +libpthread +libevent2 +librt +zlib
DEPENDS:=+libcurl +libevent2 +libminiupnpc +libpthread +librt +zlib
endef
define Package/transmission-cli-openssl
@@ -76,7 +76,7 @@ endef
define Package/transmission-remote/Default
$(call Package/transmission/template)
DEPENDS:=+libcurl +libpthread +libevent2 +librt +zlib
DEPENDS:=+libcurl +libevent2 +libminiupnpc +libpthread +librt +zlib
endef
define Package/transmission-remote-openssl
@@ -131,9 +131,6 @@ endef
Package/transmission-daemon-mbedtls/conffiles = $(Package/transmission-daemon-openssl/conffiles)
CONFIGURE_VARS += \
LIBEVENT_LIBS="$(STAGING_DIR)/usr/lib/libevent-2.0.so.5"
CONFIGURE_ARGS += \
--enable-daemon \
--enable-cli \
@@ -154,16 +151,6 @@ ifeq ($(BUILD_VARIANT),mbedtls)
MBEDTLS_LIBS="-lmbedtls -lmbedcrypto"
endif
MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
TARGET_CFLAGS += -std=gnu99
define Build/Configure
( cd $(PKG_BUILD_DIR); ./autogen.sh $(CONFIGURE_ARGS))
$(call Build/Configure/Default,$CONFIGURE_ARGS)
endef
define Package/transmission-daemon-openssl/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-daemon $(1)/usr/bin/