add debug release option to openssl

Author: zilongshanren

build/ios/build.sh

@@ -220,8 +220,13 @@ do
         if [ $lib = "curl" ]; then
             mkdir -p ssl/prebuilt/
             cp $top_dir/contrib/$install_library_path/$arch/lib/libssl.a ssl/prebuilt/libssl-$arch.a
+
             mkdir -p crypto/prebuilt/
             cp $top_dir/contrib/$install_library_path/$arch/lib/libcrypto.a crypto/prebuilt/libcrypto-$arch.a
+
+            echo "copying libz..."
+            mkdir -p z/prebuilt/
+            cp $top_dir/contrib/$install_library_path/$arch/lib/libz.a z/prebuilt/libz-$arch.a
         fi
 
         if [ $lib = "png" ]; then
@@ -255,6 +260,7 @@ do
     if [ $lib = "curl" ]; then
         create_fat_library ssl
         create_fat_library crypto
+        create_fat_library z
     fi
 
     if [ $lib = "png" ]; then

contrib/build_ios.sh

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

contrib/src/luajit/rules.mak

@@ -14,6 +14,7 @@ ifeq ($(LUAJIT_VERSION),2.0.1)
 	$(APPLY) $(SRC)/luajit/v2.0.1_hotfix1.patch
 endif
 	$(MOVE)
+
 #FIXME: arm64 is not supported
 ifeq ($(IOS_ARCH),armv7)
 LUAJIT_TARGET_FLAGS="-arch armv7 -isysroot $(IOS_SDK)"

contrib/src/openssl/rules.mak

@@ -49,12 +49,16 @@ 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
+ifeq ($(BUILD_MODE),release)
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} -O3 -DNDEBUG |g" Makefile
+endif
+ifeq ($(BUILD_MODE),debug)
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= -isysroot ${IOS_SDK} -O0 -g -DNDEBUG |g" Makefile
+endif
 endif
 ifdef HAVE_ANDROID
-	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= ${ANDROID_ARCH} |g" Makefile
+	cd $< && perl -i -pe "s|^CFLAG= (.*)|CFLAG= ${ANDROID_ARCH} -O3 |g" Makefile
 endif
 	cd $< && $(MAKE) install
 	touch $@