upgrade curl to 7.39 and fix armv7s,x86_64 build erorr for openssl

zilongshanren · zilongshanren · commit b1f48d42d18c · 2014-12-26T11:37:52.000+08:00
diff --git a/contrib/src/curl/SHA512SUMS b/contrib/src/curl/SHA512SUMS
@@ -1 +1 @@
-751eefa59dc068eb85a017399bfb482a58fa6e791017a1d9e4bce89f9b744e18be0134696df6fff64ae4498121281d5433cf7af5e8c7fa211c094c21ec6759a9  curl-7.26.0.tar.gz
+251fb2063b7414fd54d139c032a25599f9016cd95c534835450a5a5e4bc20c81042f692d8fc18648a4c972fc3c9629e6b7b405d750a7fa29599da123a6b12aa7  curl-7.39.0.tar.gz
diff --git a/contrib/src/curl/rules.mak b/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:
diff --git a/contrib/src/openssl/rules.mak b/contrib/src/openssl/rules.mak
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-751eefa59dc068eb85a017399bfb482a58fa6e791017a1d9e4bce89f9b744e18be0134696df6fff64ae4498121281d5433cf7af5e8c7fa211c094c21ec6759a9 curl-7.26.0.tar.gz`
	`1`	`+251fb2063b7414fd54d139c032a25599f9016cd95c534835450a5a5e4bc20c81042f692d8fc18648a4c972fc3c9629e6b7b405d750a7fa29599da123a6b12aa7 curl-7.39.0.tar.gz`