bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[curl]: enable compile against axTLS and CyaSSL

Browse Source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/packages@38556 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2013-10-28 10:02:47 +00:00
parent b14125f9a4
commit 122c833d1e
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/curl/Config.in
View File

@ -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"

8
libs/curl/Makefile
View File

@ -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 \

10
libs/curl/patches/100-check_long_long.patch Normal file
View File

@ -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