From 655eed48dcfa1727952ab00f2d2e97e32fd487fe Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 1 Jul 2019 16:42:22 -0700 Subject: [PATCH 1/2] libtorrent: Enable IPv6 and clean up Makefile This was not touched since I took maintainership. Signed-off-by: Rosen Penev --- libs/libtorrent/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile index 2f94b2f75..c15d13794 100644 --- a/libs/libtorrent/Makefile +++ b/libs/libtorrent/Makefile @@ -9,14 +9,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtorrent PKG_VERSION:=0.13.7 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/rakshasa/libtorrent/tar.gz/v$(PKG_VERSION)? PKG_HASH:=86b4b1753385aaddf9e59ad94f1292eee5102139eb57520e84d1af2f04693708 +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_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -26,7 +31,6 @@ define Package/libtorrent TITLE:=Rakshasa's BitTorrent library URL:=https://rakshasa.github.io/rtorrent/ DEPENDS:=+libopenssl +libsigcxx +zlib - MAINTAINER:=Rosen Penev endef define Package/libtorrent/description @@ -37,17 +41,17 @@ define Package/libtorrent/description official client. endef -TARGET_LDFLAGS += $(LIBGCC_S) - -CONFIGURE_ARGS+= \ +CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ --enable-aligned \ - --disable-debug \ --enable-openssl \ + --disable-debug \ --disable-instrumentation \ + --with-epoll \ --with-zlib=$(STAGING_DIR)/usr \ - --disable-ipv6 + --without-kqueue \ + $(DISABLE_IPV6) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include From 343e2a07e4ea4cbfad4ff938a931fc2818c530f4 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 1 Jul 2019 16:57:31 -0700 Subject: [PATCH 2/2] 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 8c21cbcc8..c6a5006ea 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/