From cdeed7fdf198cbc4e42a6ffb4caf5fd3854197ff Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Mon, 28 Oct 2013 10:02:47 +0000 Subject: [PATCH] [curl]: enable compile against axTLS and CyaSSL Signed-off-by: Imre Kaloz SVN-Revision: 38556 --- libs/curl/Config.in | 6 ++++++ libs/curl/Makefile | 8 ++++++-- libs/curl/patches/100-check_long_long.patch | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 libs/curl/patches/100-check_long_long.patch diff --git a/libs/curl/Config.in b/libs/curl/Config.in index 8ded6f3664..a52b18ec15 100644 --- a/libs/curl/Config.in +++ b/libs/curl/Config.in @@ -8,6 +8,12 @@ choice config LIBCURL_POLARSSL bool "PolarSSL" +config LIBCURL_CYASSL + bool "CyaSSL" + +config LIBCURL_AXTLS + bool "axTLS" + config LIBCURL_OPENSSL bool "OpenSSL" diff --git a/libs/curl/Makefile b/libs/curl/Makefile index f8d816c9ab..d435ccdc24 100644 --- a/libs/curl/Makefile +++ b/libs/curl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl PKG_VERSION:=7.33.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ @@ -27,8 +27,10 @@ PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS := \ + LIBCURL_AXTLS \ LIBCURL_COOKIES \ LIBCURL_CRYPTO_AUTH \ + LIBCURL_CYASSL \ LIBCURL_DICT \ LIBCURL_FILE \ LIBCURL_FTP \ @@ -73,7 +75,7 @@ define Package/libcurl $(call Package/curl/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+LIBCURL_POLARSSL:libpolarssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread + DEPENDS:=+LIBCURL_POLARSSL:libpolarssl +LIBCURL_CYASSL:libcyassl +LIBCURL_AXTLS:libaxtls +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_ZLIB:zlib +LIBCURL_THREADED_RESOLVER:libpthread TITLE:=A client-side URL transfer library using $(if $(CONFIG_LIBCURL_POLARSSL),PolarSSL)$(if $(CONFIG_LIBCURL_OPENSSL),OpenSSL)$(if $(CONFIG_LIBCURL_GNUTLS),GNUTLS)$(if $(CONFIG_LIBCURL_NOSSL),no SSL) MENU:=1 endef @@ -100,8 +102,10 @@ CONFIGURE_ARGS += \ --without-nss \ --without-libssh2 \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ + $(if $(CONFIG_LIBCURL_AXTLS),--with-axtls="$(STAGING_DIR)/usr",--without-axtls) \ $(if $(CONFIG_LIBCURL_COOKIES),--enable,--disable)-cookies \ $(if $(CONFIG_LIBCURL_CRYPTO-AUTH),--enable,--disable)-crypto-auth \ + $(if $(CONFIG_LIBCURL_CYASSL),--with-cyassl="$(STAGING_DIR)/usr",--without-cyassl) \ $(if $(CONFIG_LIBCURL_DICT),--enable,--disable)-dict \ $(if $(CONFIG_LIBCURL_FILE),--enable,--disable)-file \ $(if $(CONFIG_LIBCURL_FTP),--enable,--disable)-ftp \ diff --git a/libs/curl/patches/100-check_long_long.patch b/libs/curl/patches/100-check_long_long.patch new file mode 100644 index 0000000000..f9088d85ec --- /dev/null +++ b/libs/curl/patches/100-check_long_long.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -2889,6 +2889,7 @@ + + AC_CHECK_SIZEOF(size_t) + AC_CHECK_SIZEOF(long) ++AC_CHECK_SIZEOF(long long) + AC_CHECK_SIZEOF(int) + AC_CHECK_SIZEOF(short) + CURL_CONFIGURE_LONG -- 2.30.2