modify ios build scripts

Author: zilongshanren

build/ios/build.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 set -e
+set -x
 
 PLATFORM=OS
 VERBOSE=no
@@ -10,7 +11,7 @@ ARCH=armv7
 
 # TODO: configure to compile speficy 3rd party libraries
 OPTIONS="
-    --disable-lua
+    --enable-lua
     --enable-freetype2
     --enable-png
 "
@@ -19,12 +20,13 @@ OPTIONS="
 usage()
 {
 cat << EOF
-usage: $0 [-s] [-k sdk]
+usage: $0 [-s] [-k sdk] [-a arch] [-l libname]
 
 OPTIONS
    -k <sdk version>      Specify which sdk to use ('xcodebuild -showsdks', current: ${SDK_VERSION})
    -s            Build for simulator
    -a <arch>     Specify which arch to use (current: ${ARCH})
+   -l <libname>  Specify which static library to build
 EOF
 }
 
@@ -46,7 +48,7 @@ info()
 }
 
 
-while getopts "hvsk:a:" OPTION
+while getopts "hvsk:a:l:" OPTION
 do
      case $OPTION in
          h)
@@ -65,6 +67,9 @@ do
          a)
              ARCH=$OPTARG
              ;;
+         l)
+             OPTIONS=--enable-$OPTARG
+             ;;
          ?)
              usage
              exit 1

contrib/src/openssl/SHA512SUMS

@@ -1 +1 @@
-e4a68857b509bbaa5c66bf43491541e309e37f136816a1380664488420805edc74dc7f94c6318e34e077b29d53d060f971ba69b9efcfa0da9605934b2be45ef4  openssl-0.9.8zc.tar.gz
+a786bb99b68d88c1de79d3c5372767f091ebeefb5abc1d4883253fd3ab5a86af53389f5ff36fdd8faa27c5fb78be8bbff406392c373358697da80d250eadebb8  openssl-1.0.1j.tar.gz

contrib/src/openssl/rules.mak

@@ -1,5 +1,5 @@
 # OPENSSL
-OPENSSL_VERSION := 0.9.8zc
+OPENSSL_VERSION := 1.0.1j
 OPENSSL_URL := https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
 
 #FIXME: we don't want to use scripts to determine which libraries should be
@@ -10,6 +10,11 @@ OPENSSL_URL := https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
 # PKGS_FOUND += openssl
 # endif
 
+# ifeq ($(shell uname),Darwin) # openssl tries to use libtool on Darwin
+# ifdef HAVE_CROSS_COMPILE
+# ZLIB_CONFIG_VARS=CHOST=$(HOST)
+# endif
+# endif
 
 $(TARBALLS)/openssl-$(OPENSSL_VERSION).tar.gz:
 	$(call download,$(OPENSSL_URL))
@@ -21,7 +26,7 @@ openssl: openssl-$(OPENSSL_VERSION).tar.gz .sum-openssl
 	$(MOVE)
 
 .openssl: openssl
-	cd $< && ./config no-shared --openssldir=$(PREFIX)
+	cd $< && $(HOSTVARS) ./config  no-shared --prefix=$(PREFIX)
 	cd $< && $(MAKE) $(HOSTVARS)
 	cd $< && $(MAKE) install
 	touch $@