Merge pull request #28 from andyque/upgrade-curl

Upgrade curl to 7.39.0

Author: minggo

build/android.ini

@@ -4,7 +4,7 @@ cfg_default_build_arches="all"
 cfg_default_build_mode="release"
 cfg_default_build_libraries="all"
 #specific default values
-cfg_default_build_api=21
+cfg_default_build_api=9
 cfg_default_gcc_version=4.9
 cfg_arm_alias_folder_name="armeabi"
 cfg_armv7_alias_folder_name="armeabi-v7a"

build/mac.ini

@@ -21,7 +21,7 @@ cfg_is_cross_compile=no
 #build arches and build libraries
 cfg_all_supported_arches=("i386" "x86_64")
 cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg"  "tiff" "webp" "chipmunk" "glfw" "openssl" "gafplayer")
-cfg_default_arches_all=("x86_64" "i386")
+cfg_default_arches_all=("x86_64")
 cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "glfw" "openssl" "gafplayer")
 
 

contrib/bootstrap

@@ -209,6 +209,8 @@ check_macosx_sdk()
 
    add_make "MACOSX_SDK=${SDKROOT}"
    add_make "OSX_VERSION ?= ${OSX_VERSION}"
+   # TODO: the system libssl.dylib would config with the one we built
+   # add_make "EXTRA_LDFLAGS := -L${SDKROOT}/usr/lib "
 }
 
 check_android_sdk()

contrib/src/curl/SHA512SUMS

@@ -1 +1 @@
-751eefa59dc068eb85a017399bfb482a58fa6e791017a1d9e4bce89f9b744e18be0134696df6fff64ae4498121281d5433cf7af5e8c7fa211c094c21ec6759a9  curl-7.26.0.tar.gz
+251fb2063b7414fd54d139c032a25599f9016cd95c534835450a5a5e4bc20c81042f692d8fc18648a4c972fc3c9629e6b7b405d750a7fa29599da123a6b12aa7  curl-7.39.0.tar.gz

contrib/src/curl/android.patch

@@ -0,0 +1,25 @@
+diff --git a/lib/curl_config.h b/lib/curl_config.h
+index 6acb5e4..e795bf3 100644
+--- a/lib/curl_config.h
++++ b/lib/curl_config.h
+@@ -199,8 +199,6 @@
+ /* Define to 1 if the getaddrinfo function is threadsafe. */
+ #define HAVE_GETADDRINFO_THREADSAFE 1
+ 
+-/* Define to 1 if you have the `geteuid' function. */
+-#define HAVE_GETEUID 1
+ 
+ /* Define to 1 if you have the gethostbyaddr function. */
+ #define HAVE_GETHOSTBYADDR 1
+@@ -250,11 +248,6 @@
+ /* Define to 1 if you have the `getprotobyname' function. */
+ #define HAVE_GETPROTOBYNAME 1
+ 
+-/* Define to 1 if you have the `getpwuid' function. */
+-#define HAVE_GETPWUID 1
+-
+-/* Define to 1 if you have the `getpwuid_r' function. */
+-#define HAVE_GETPWUID_R 1
+ 
+ /* Define to 1 if you have the `getrlimit' function. */
+ #define HAVE_GETRLIMIT 1

contrib/src/curl/rules.mak

@@ -1,6 +1,6 @@
 # curl
 
-CURL_VERSION := 7.26.0
+CURL_VERSION := 7.39.0
 CURL_URL :=  http://curl.haxx.se/download/curl-$(CURL_VERSION).tar.gz
 
 $(TARBALLS)/curl-$(CURL_VERSION).tar.gz:
@@ -17,10 +17,19 @@ DEPS_curl = zlib $(DEPS_zlib)
 
 DEPS_curl = openssl $(DEPS_openssl)
 
+ifdef HAVE_LINUX
+configure_option=--without-libidn --without-librtmp
+endif
+
 .curl: curl .zlib .openssl
+	$(RECONF)
 	cd $< && $(HOSTVARS_PIC) ./configure $(HOSTCONF) \
-		--with-ssl \
+		--with-ssl=$(PREFIX) \
 		--with-zlib \
-	cd $< && $(MAKE)
+		--disable-ldap \
+		$(configure_option)
+# ifdef HAVE_ANDROID
+# 	$(APPLY) $(SRC)/curl/android.patch
+# endif
 	cd $< && $(MAKE) install
 	touch $@

contrib/src/openssl/rules.mak

@@ -17,13 +17,13 @@ endif
 
 ifdef HAVE_LINUX
 ifeq ($(MY_TARGET_ARCH),x86_64)
-OPENSSL_CONFIG_VARS="linux-generic64"
-OPENSSL_ARCH=-m64
+OPENSSL_CONFIG_VARS="linux-x86_64"
+OPENSSL_ARCH=-m64 -no-ssl2
 endif
 
 ifeq ($(MY_TARGET_ARCH),i386)
 OPENSSL_CONFIG_VARS="linux-generic32"
-OPENSSL_ARCH=-m32
+OPENSSL_ARCH=-m32 -no-ssl2
 endif
 endif
 
@@ -47,6 +47,12 @@ endif
 ifeq ($(MY_TARGET_ARCH),arm64)
 OPENSSL_CONFIG_VARS="BSD-generic64"
 endif
+ifeq ($(MY_TARGET_ARCH),armv7s)
+OPENSSL_CONFIG_VARS="BSD-generic32"
+endif
+ifeq ($(MY_TARGET_ARCH),x86_64)
+OPENSSL_CONFIG_VARS="darwin64-x86_64-cc"
+endif
 endif
 
 $(TARBALLS)/openssl-$(OPENSSL_VERSION).tar.gz:
@@ -71,8 +77,8 @@ ifdef HAVE_LINUX
 	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= ${EXTRA_CFLAGS} ${OPTIM} |g" Makefile
 endif
 ifdef HAVE_MACOSX
-	cd $< && perl -i -pe "s|^CC= xcrun clang|CC= xcrun cc  -mmacosx-version-min=10.6 |g" Makefile
-	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${MACOSX_SDK} -arch ${MY_TARGET_ARCH} ${OPTIM} |g" Makefile
+	cd $< && perl -i -pe "s|^CC= xcrun clang|CC= xcrun cc -arch ${MY_TARGET_ARCH} -mmacosx-version-min=10.7 |g" Makefile
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${MACOSX_SDK} ${OPTIM} |g" Makefile
 endif
 	cd $< && $(MAKE) install
 	touch $@