NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libtorrent: zlib is mandatory

Browse Source 
zlib isn't optional even though it seems like it, fixes build failure
such as:

log.cc:51:18: fatal error: zlib.h: No such file or directory

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2015-10-04 22:04:37 -03:00 committed by Peter Korsgaard
parent f904fd9f1d
commit f7facd5b09
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/libtorrent/Config.in
View File

@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBTORRENT
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_ARCH_HAS_ATOMICS depends on BR2_ARCH_HAS_ATOMICS
select BR2_PACKAGE_ZLIB
help help
BitTorrent library written in C++ for *nix BitTorrent library written in C++ for *nix

9
package/libtorrent/libtorrent.mk
View File

@ -6,13 +6,12 @@
LIBTORRENT_VERSION = 0.13.6 LIBTORRENT_VERSION = 0.13.6
LIBTORRENT_SITE = http://rtorrent.net/downloads LIBTORRENT_SITE = http://rtorrent.net/downloads
LIBTORRENT_DEPENDENCIES = host-pkgconf \ LIBTORRENT_DEPENDENCIES = host-pkgconf zlib \
$(if $(BR2_PACKAGE_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_OPENSSL),openssl)
$(if $(BR2_PACKAGE_ZLIB),zlib)
LIBTORRENT_CONF_OPTS = --enable-aligned \ LIBTORRENT_CONF_OPTS = --enable-aligned \
--disable-instrumentation \ --disable-instrumentation \
$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl) \ --with-zlib=$(STAGING_DIR)/usr \
$(if $(BR2_PACKAGE_ZLIB),--with-zlib=$(STAGING_DIR)/usr,--without-zlib) $(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
LIBTORRENT_INSTALL_STAGING = YES LIBTORRENT_INSTALL_STAGING = YES
LIBTORRENT_AUTORECONF = YES LIBTORRENT_AUTORECONF = YES
LIBTORRENT_LICENSE = GPLv2 LIBTORRENT_LICENSE = GPLv2