Skip to contentSkip to conversation

libtorrent: refactor openssl optional dependency

PATCH New Asaf Kahlon 2 participants 2 messages Aug 30, 2018 – Sep 1, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libtorrent: refactor openssl optional dependency

---
 package/libtorrent/libtorrent.mk | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
package/libtorrent/libtorrent.mk +9 -4
index 8d74addaf7..de964b45ae 100644
@@ -6,15 +6,20 @@
 
 LIBTORRENT_VERSION = 0.13.7
 LIBTORRENT_SITE = http://rtorrent.net/downloads
-LIBTORRENT_DEPENDENCIES = host-pkgconf zlib \
-	$(if $(BR2_PACKAGE_OPENSSL),openssl)
+LIBTORRENT_DEPENDENCIES = host-pkgconf zlib
 LIBTORRENT_CONF_OPTS = --enable-aligned \
 	--disable-instrumentation \
-	--with-zlib=$(STAGING_DIR)/usr \
-	$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
+	--with-zlib=$(STAGING_DIR)/usr
 LIBTORRENT_INSTALL_STAGING = YES
 LIBTORRENT_AUTORECONF = YES
 LIBTORRENT_LICENSE = GPL-2.0
 LIBTORRENT_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBTORRENT_CONF_OPTS += --enable-openssl
+LIBTORRENT_DEPENDENCIES += openssl
+else
+LIBTORRENT_CONF_OPTS += --disable-openssl
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 libtorrent: refactor openssl optional dependency

Hello,

Quoted 4 lines · Asaf Kahlon
---
 package/libtorrent/libtorrent.mk | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com