update libcurl for mac

Author: zilongshanren

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/rules.mak

@@ -18,13 +18,13 @@ DEPS_curl = zlib $(DEPS_zlib)
 DEPS_curl = openssl $(DEPS_openssl)
 
 .curl: curl .zlib .openssl
+	$(RECONF)
 	cd $< && $(HOSTVARS_PIC) ./configure $(HOSTCONF) \
-		--with-ssl \
+		--with-ssl=$(PREFIX) \
 		--with-zlib \
-
+		--disable-ldap
 # ifdef HAVE_ANDROID
 # 	$(APPLY) $(SRC)/curl/android.patch
 # endif
-	cd $< && $(MAKE)
 	cd $< && $(MAKE) install
 	touch $@

contrib/src/openssl/rules.mak

@@ -77,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 $@