From 343e2a07e4ea4cbfad4ff938a931fc2818c530f4 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 1 Jul 2019 16:57:31 -0700 Subject: [PATCH] rtorrent: Enable IPv6 support Other Makefile cleanups as well. Signed-off-by: Rosen Penev --- net/rtorrent/Makefile | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index 8c21cbcc86..c6a5006eaa 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -9,20 +9,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtorrent PKG_VERSION:=0.9.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/rakshasa/rtorrent/releases/download/v$(PKG_VERSION) PKG_HASH:=5d9842fe48c9582fbea2c7bf9f51412c1ccbba07d059b257039ad53b863fe8bb +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -PKG_LICENSE:=GPL-2.0 +PKG_MAINTAINER:=Rosen Penev +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_FIXUP:=autoreconf -PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -31,9 +31,8 @@ define Package/rtorrent/Default SECTION:=net CATEGORY:=Network TITLE:=BitTorrent client for ncurses - URL:=http://libtorrent.rakshasa.no/ - DEPENDS:=+libcurl +libtorrent +libncursesw +libsigcxx +libpthread - MAINTAINER:=Rosen Penev + URL:=https://github.com/rakshasa/rtorrent + DEPENDS:=+libcurl +libtorrent +libncurses +libsigcxx +libpthread endef define Package/rtorrent/Default/description @@ -65,20 +64,18 @@ $(call Package/rtorrent/Default/description) This package is built with xmlrpc support endef -TARGET_LDFLAGS += -lz -lpthread -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -CONFIGURE_ARGS+= \ +CONFIGURE_ARGS += \ --enable-shared \ --disable-static \ --disable-debug \ - --disable-ipv6 + --with-libcurl="$(STAGING_DIR)/usr" \ + --with-ncurses \ + $(if $(CONFIG_IPV6),--enable,--disable)-ipv6 ifeq ($(BUILD_VARIANT),rpc) - CONFIGURE_ARGS += \ - --with-xmlrpc-c +CONFIGURE_ARGS += --with-xmlrpc-c endif - define Package/rtorrent/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rtorrent $(1)/usr/bin/ -- 2.30.2