Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

curl: add optional zlib support

Browse source 
Package libcurl is missing dependencies for the following libraries:
libzstd.so.1

Previous patch by Hans Dedecker <dedeckeh@gmail.com> took the easy way
out :)

Suggested-by: Syrone Wong <wong.syrone@gmail.com>
Signed-off-by: Tony Butler <spudz76@gmail.com>
[fixed title]
Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Tony Butler 2020-08-23 08:10:37 -07:00 committed by Paul Spooren
parent 30fecae052
commit 7b6f58e9d0
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/curl/Config.in
View file

@ -133,6 +133,10 @@ config LIBCURL_ZLIB
bool "Enable zlib support" bool "Enable zlib support"
default n default n
config LIBCURL_ZSTD
bool "Enable zstd support"
default n
config LIBCURL_UNIX_SOCKETS config LIBCURL_UNIX_SOCKETS
bool "Enable unix domain socket support" bool "Enable unix domain socket support"
default n default n

6
net/curl/Makefile
View file

@ -37,6 +37,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_LIBCURL_LIBIDN2 \ CONFIG_LIBCURL_LIBIDN2 \
CONFIG_LIBCURL_SSH2 \ CONFIG_LIBCURL_SSH2 \
CONFIG_LIBCURL_ZLIB \ CONFIG_LIBCURL_ZLIB \
CONFIG_LIBCURL_ZSTD \
\ \
CONFIG_LIBCURL_DICT \ CONFIG_LIBCURL_DICT \
CONFIG_LIBCURL_FILE \ CONFIG_LIBCURL_FILE \
@ -91,8 +92,8 @@ define Package/libcurl
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN2:libidn2 DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_ZSTD:libzstd +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap
DEPENDS += +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle DEPENDS += +LIBCURL_LIBIDN2:libidn2 +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle
TITLE:=A client-side URL transfer library TITLE:=A client-side URL transfer library
MENU:=1 MENU:=1
ABI_VERSION:=4 ABI_VERSION:=4
@ -131,6 +132,7 @@ CONFIGURE_ARGS += \
$(if $(CONFIG_LIBCURL_LIBIDN2),--with-libidn2="$(STAGING_DIR)/usr",--without-libidn2) \ $(if $(CONFIG_LIBCURL_LIBIDN2),--with-libidn2="$(STAGING_DIR)/usr",--without-libidn2) \
$(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \ $(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \
$(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \ $(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
$(if $(CONFIG_LIBCURL_ZSTD),--with-zstd="$(STAGING_DIR)/usr",--without-zstd) \
$(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \ $(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \
\ \
$(call autoconf_bool,CONFIG_LIBCURL_DICT,dict) \ $(call autoconf_bool,CONFIG_LIBCURL_DICT,dict) \