diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-03-11 18:04:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-03-11 18:04:11 +0100 |
| commit | 942a1dda2b6907db6970c8bff6d511d1a4950725 (patch) | |
| tree | cc927edb40b3ea6911ee78835d5cc40a15fe9df1 /package/curl/Makefile | |
| parent | 85a8eebad2ec52266e98e4a764ea61f6d58f101f (diff) | |
add gnutls support to curl package, add depends to ca-certificates package
Diffstat (limited to 'package/curl/Makefile')
| -rw-r--r-- | package/curl/Makefile | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile index 7d058fcf1..276f832c2 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,32 +4,54 @@ include ${TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.22.0 +PKG_VERSION:= 7.24.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= e8c36126d21c893f085aca233906b5cc +PKG_MD5SUM:= b93420f80a2baaa61a0f45214eddc2ba PKG_DESCR:= a client-side URL transfer tool PKG_SECTION:= www PKG_DEPENDS:= libcurl -PKG_BUILDDEP:= openssl zlib +PKG_BUILDDEP:= zlib PKG_URL:= http://curl.haxx.se/ PKG_SITES:= http://curl.haxx.se/download/ PKG_SUBPKGS:= CURL LIBCURL LIBCURL_DEV PKGSD_LIBCURL:= a client-side URL transfer library PKGSC_LIBCURL:= libs -PKGSS_LIBCURL:= libopenssl zlib +PKGSS_LIBCURL:= zlib PKGSD_LIBCURL_DEV:= development files for libcurl PKGSC_LIBCURL_DEV:= devel PKG_FLAVOURS_CURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support +PKG_CHOICES_CURL:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS +PKGCD_WITHOUT_SSL:= use no SSL +PKGCD_WITH_OPENSSL:= use OpenSSL 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 + include ${TOPDIR}/mk/package.mk $(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})) $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV})) +ifeq (${ADK_PACKAGE_CURL_WITHOUT_SSL},y) +CONFIGURE_ARGS+= --without-ssl \ + --without-gnutls +endif +ifeq (${ADK_PACKAGE_CURL_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \ + --without-gnutls +endif +ifeq (${ADK_PACKAGE_CURL_WITH_GNUTLS},y) +CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \ + --without-ssl +endif + TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t CONFIGURE_ARGS+= --disable-thread \ @@ -48,9 +70,7 @@ CONFIGURE_ARGS+= --disable-thread \ --disable-telnet \ --disable-verbose \ --with-random="/dev/urandom" \ - --with-ssl="${STAGING_TARGET_DIR}/usr" \ - --without-ca-bundle \ - --without-gnutls \ + --with-ca-bundle="/etc/ssl/cert.pem" \ --without-libidn ifneq (${ADK_PACKAGE_CURL_WITH_IPV6},) |