summaryrefslogtreecommitdiff
path: root/package/curl
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-03 06:21:47 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-03 07:59:00 +0100
commit0f7048ae6bbdeb82728242cc7e34bf6ec1e98ebb (patch)
tree2cc88efd169895afd4fadfc37e74e9a16d9273a8 /package/curl
parent710beca6a35dc01f6f0c2afaa39084e60d7426ae (diff)
add support for cyassl, update to latest upstream
Diffstat (limited to 'package/curl')
-rw-r--r--package/curl/Makefile18
1 files changed, 13 insertions, 5 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile
index b80dd5f35..7f0cda615 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= curl
-PKG_VERSION:= 7.39.0
+PKG_VERSION:= 7.40.0
PKG_RELEASE:= 1
-PKG_HASH:= a3a7c2b9e7416c728469eb4cb5b61e9161335df4278329e1d9cc3c194e25d795
+PKG_HASH:= c2e0705a13e53f8f924d1eaeb2ab94f59a9e162007c489b9ab0c96238bddf84b
PKG_DESCR:= client-side url transfer tool
PKG_SECTION:= net/http
PKG_DEPENDS:= libcurl
@@ -26,7 +26,7 @@ PKGSS_LIBCURL:= zlib
PKG_FLAVOURS_CURL:= WITH_IPV6
PKGFD_WITH_IPV6:= enable ipv6 support
-PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL
+PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL WITH_CYASSL
PKGCD_WITHOUT_SSL:= use no ssl
PKGCD_WITH_OPENSSL:= use openssl for crypto
PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp
@@ -34,6 +34,9 @@ PKGCB_WITH_OPENSSL:= openssl
PKGCD_WITH_GNUTLS:= use gnutls for crypto
PKGCS_WITH_GNUTLS:= libgnutls ca-certificates libgmp
PKGCB_WITH_GNUTLS:= gnutls
+PKGCD_WITH_CYASSL:= use cyassl for crypto
+PKGCS_WITH_CYASSL:= cyassl ca-certificates
+PKGCB_WITH_CYASSL:= cyassl
include ${ADK_TOPDIR}/mk/package.mk
@@ -55,10 +58,15 @@ CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \
--without-ssl \
--without-axtls
endif
+ifeq (${ADK_PACKAGE_LIBCURL_WITH_CYASSL},y)
+CONFIGURE_ARGS+= --with-cyassl="${STAGING_TARGET_DIR}/usr" \
+ --without-ssl \
+ --without-gnutls \
+ --without-axtls
+endif
CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t
-CONFIGURE_ARGS+= --disable-thread \
- --enable-cookies \
+CONFIGURE_ARGS+= --enable-cookies \
--enable-crypto-auth \
--enable-nonblocking \
--enable-file \