fix openssl compile error on ios

Author: zilongshanren

build/android/build.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 set -e
+set -x
 
 info()
 {
@@ -17,10 +18,10 @@ ANDROID_ARCH=arm
 
 # TODO: configure to compile specify 3rd party libraries
 OPTIONS="
-    --disable-lua
-    --disable-freetype2
+    --enable-lua
+    --enable-freetype2
     --enable-png
-    --disable-zlib
+    --enable-zlib
 "
 
 usage()
@@ -34,6 +35,7 @@ OPTIONS:
    -k <sdk>      Use the specified Android API level (default: $ANDROID_API)
    -a <arch>     Use the specified arch (default: $ANDROID_ABI)
    -n <version>  Use the gcc version(default: $ANDROID_GCC_VERSION)
+   -l <libname>  Use the specified library name
 EOF
 }
 
@@ -47,7 +49,7 @@ spopd()
     popd > /dev/null
 }
 
-while getopts "hvk:a:" OPTION
+while getopts "hvk:a:l:" OPTION
 do
      case $OPTION in
          h)
@@ -57,16 +59,19 @@ do
          q)
              set +x
              QUIET="yes"
-         ;;
+             ;;
          a)
              ANDROID_ABI=$OPTARG
-         ;;
+             ;;
          k)
              ANDROID_API=$OPTARG
-         ;;
+             ;;
          n)
              ANDROID_GCC_VERSION=$OPTARG
-         ;;
+             ;;
+         l)
+             OPTIONS=--enable-$OPTARG
+             ;;
      esac
 done
 
@@ -106,8 +111,8 @@ cocos_root=`pwd`/../..
 
 export ANDROID_ABI
 export ANDROID_API
-export LDFLAGS="-L${ANDROID_NDK}/platforms/${ANDROID_API}/arch-${ANDROID_ARCH}/usr/lib"
-info "LD FLAGS SELECTED = '${LDFLAGS}'"
+# export LDFLAGS="-L${ANDROID_NDK}/platforms/${ANDROID_API}/arch-${ANDROID_ARCH}/usr/lib"
+# info "LD FLAGS SELECTED = '${LDFLAGS}'"
 
 export PATH="${toolchain_bin}:${cocos_root}/extras/tools/bin:$PATH"
 #

build/ios/build.sh

@@ -203,6 +203,7 @@ fi
 
 echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_LDFLAGS += ${EXTRA_LDFLAGS}" >> config.mak
+echo "IOS_ARCH := ${ARCH}" >> config.mak
 make fetch
 make list
 make

contrib/src/openssl/rules.mak

@@ -22,6 +22,15 @@ ifdef HAVE_ANDROID
 OPENSSL_COMPILER=os/compiler:$(HOST)
 endif
 
+ifeq ($(IOS_ARCH),armv7)
+OPENSSL_CONFIG_VARS="BSD-generic32"
+endif
+
+ifeq ($(IOS_ARCH),i386)
+OPENSSL_CONFIG_VARS="BSD-generic32"
+endif
+
+
 $(TARBALLS)/openssl-$(OPENSSL_VERSION).tar.gz:
 	$(call download,$(OPENSSL_URL))
 
@@ -36,5 +45,10 @@ endif
 
 .openssl: openssl
 	cd $< && $(HOSTVARS)  ./Configure $(OPENSSL_CONFIG_VARS)  --prefix=$(PREFIX) $(OPENSSL_COMPILER)
+ifdef HAVE_IOS
+	# cd $< && perl -i -pe 's|static volatile sig_atomic_t intr_signal|static volatile int intr_signal|' crypto/ui/ui_openssl.c
+	cd $< && perl -i -pe "s|^CC= xcrun clang|CC= xcrun cc -arch ${IOS_ARCH} -miphoneos-version-min=6.0 |g" Makefile
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} |g" Makefile
+endif
 	cd $< && $(MAKE) install
 	touch $@