aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-19 15:02:30 +0200
committerFelix Fietkau <nbd@nbd.name>2016-05-19 16:56:34 +0200
commit1d0d5ddb0771deba3e321fbe388e1e3587d4629f (patch)
treecb31147ab7b409798d87a5ae65db7d8728600e74
parent6aebc6b16b3e2e7058b8b5ab1ffa7f65920541ff (diff)
downloadupstream-1d0d5ddb0771deba3e321fbe388e1e3587d4629f.tar.gz
upstream-1d0d5ddb0771deba3e321fbe388e1e3587d4629f.tar.bz2
upstream-1d0d5ddb0771deba3e321fbe388e1e3587d4629f.zip
curl: remove axtls config option, the library does not exist in our tree
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/network/utils/curl/Config.in3
-rw-r--r--package/network/utils/curl/Makefile4
2 files changed, 1 insertions, 6 deletions
diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in
index 7a46e4e25a..1e98b3a598 100644
--- a/package/network/utils/curl/Config.in
+++ b/package/network/utils/curl/Config.in
@@ -15,9 +15,6 @@ choice
config LIBCURL_CYASSL
bool "CyaSSL"
- config LIBCURL_AXTLS
- bool "axTLS"
-
config LIBCURL_OPENSSL
bool "OpenSSL"
diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile
index 4b41ac33e9..93d0566a87 100644
--- a/package/network/utils/curl/Makefile
+++ b/package/network/utils/curl/Makefile
@@ -29,7 +29,6 @@ PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:= \
CONFIG_IPV6 \
\
- CONFIG_LIBCURL_AXTLS \
CONFIG_LIBCURL_CYASSL \
CONFIG_LIBCURL_GNUTLS \
CONFIG_LIBCURL_OPENSSL \
@@ -88,7 +87,7 @@ define Package/libcurl
$(call Package/curl/Default)
SECTION:=libs
CATEGORY:=Libraries
- DEPENDS:=+LIBCURL_POLARSSL:libpolarssl +LIBCURL_CYASSL:libcyassl +LIBCURL_AXTLS:libaxtls +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
+ DEPENDS:=+LIBCURL_POLARSSL:libpolarssl +LIBCURL_CYASSL:libcyassl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap +LIBCURL_LIBIDN:libidn +LIBCURL_SSH2:libssh2
TITLE:=A client-side URL transfer library
MENU:=1
@@ -115,7 +114,6 @@ CONFIGURE_ARGS += \
\
$(call autoconf_bool,CONFIG_IPV6,ipv6) \
\
- $(if $(CONFIG_LIBCURL_AXTLS),--with-axtls="$(STAGING_DIR)/usr" --without-ca-path,--without-axtls) \
$(if $(CONFIG_LIBCURL_CYASSL),--with-cyassl="$(STAGING_DIR)/usr" --without-ca-path --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt,--without-cyassl) \
$(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-gnutls) \
$(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr" --without-ca-bundle --with-ca-path=/etc/ssl/certs,--without-ssl) \