diff options
Diffstat (limited to 'package/curl/Makefile')
| -rw-r--r-- | package/curl/Makefile | 67 |
1 files changed, 40 insertions, 27 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile index b4e1f5abc..c4711a7d2 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,31 +4,37 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.60.0 +PKG_VERSION:= 8.16.0 PKG_RELEASE:= 1 -PKG_HASH:= 8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0 +PKG_HASH:= 40c8cddbcb6cc6251c03dea423a472a6cea4037be654ba5cf5dec6eb2d22ff1d PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http -PKG_DEPENDS:= libcurl PKG_BUILDDEP:= zlib +HOST_BUILDDEP:= openssl-host PKG_NEEDS:= threads -PKG_URL:= http://curl.haxx.se/ -PKG_SITES:= http://curl.haxx.se/download/ +PKG_URL:= https://curl.se/ +PKG_SITES:= https://curl.se/download/ PKG_LIBNAME:= libcurl PKG_OPTS:= dev -PKG_SUBPKGS:= CURL LIBCURL +PKG_SUBPKGS:= LIBCURL CURL PKGSD_LIBCURL:= client-side url transfer library PKGSC_LIBCURL:= libs/net PKGSS_LIBCURL:= zlib +PKGSD_CURL:= client-side url transfer utility +PKGSC_CURL:= net/http +PKGSS_CURL:= zlib libcurl -PKG_FLAVOURS_CURL:= WITH_IPV6 +PKG_FLAVOURS_LIBCURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable ipv6 support -PKG_CHOICES_CURL:= WITH_LIBRESSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL +PKG_CHOICES_LIBCURL:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl +PKGCD_WITH_OPENSSL:= use libopenssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_GNUTLS:= use gnutls for crypto PKGCS_WITH_GNUTLS:= libgnutls ca-certificates PKGCB_WITH_GNUTLS:= gnutls @@ -41,40 +47,47 @@ include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL},${PKG_OPTS})) +$(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +HOST_CONFIGURE_ARGS+= --with-openssl="$(STAGING_HOST_DIR)/usr" \ + --without-libpsl -ifeq (${ADK_PACKAGE_CURL_WITH_LIBRESSL},y) -CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \ +ifeq (${ADK_PACKAGE_LIBCURL_WITH_LIBRESSL},y) +CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" \ --without-gnutls \ - --without-axtls + --without-wolfssl endif -ifeq (${ADK_PACKAGE_CURL_WITH_GNUTLS},y) +ifeq (${ADK_PACKAGE_LIBCURL_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-openssl="${STAGING_TARGET_DIR}/usr" \ + --without-gnutls \ + --without-wolfssl +endif +ifeq (${ADK_PACKAGE_LIBCURL_WITH_GNUTLS},y) CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \ - --without-ssl \ - --without-axtls + --without-openssl \ + --without-wolfssl endif -ifeq (${ADK_PACKAGE_CURL_WITH_WOLFSSL},y) -CONFIGURE_ARGS+= --with-cyassl="${STAGING_TARGET_DIR}/usr" \ - --without-ssl \ - --without-gnutls \ - --without-axtls +ifeq (${ADK_PACKAGE_LIBCURL_WITH_WOLFSSL},y) +CONFIGURE_ARGS+= --with-wolfssl="${STAGING_TARGET_DIR}/usr" \ + --without-openssl \ + --without-gnutls endif -ifeq (${ADK_PACKAGE_CURL_WITHOUT_SSL},y) +ifeq (${ADK_PACKAGE_LIBCURL_WITHOUT_SSL},y) CONFIGURE_ARGS+= --without-ssl \ --without-gnutls \ - --without-axtls + --without-wolfssl endif -CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t +CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t \ + LDFLAGS='$(TARGET_LDFLAGS) -latomic' CONFIGURE_ARGS+= --enable-cookies \ - --enable-crypto-auth \ - --enable-nonblocking \ --enable-file \ --enable-ftp \ --enable-http \ --enable-proxy \ --disable-curldebug \ + --disable-ntlm \ --disable-ntlm-wb \ --disable-symbol-hiding \ --disable-ares \ @@ -89,13 +102,13 @@ CONFIGURE_ARGS+= --enable-cookies \ --disable-telnet \ --disable-verbose \ --without-libssh2 \ + --without-libpsl \ --without-librtmp \ - --without-libidn \ --with-ca-path="/etc/ssl/certs" \ --with-random="/dev/urandom" \ --without-ca-bundle -ifneq (${ADK_PACKAGE_CURL_WITH_IPV6},) +ifneq (${ADK_PACKAGE_LIBCURL_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 |