rebuild without bitcode

Author: songchenwen

.gitignore

@@ -1 +1,3 @@
-*.DS_Store
+*.DS_Store
+openssl-*/*
+openssl-*.tar.gz

OpenSSL.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "OpenSSL"
   s.version      = "1.0.1j"
-  s.summary      = "OpenSSL Libraries and CocoaPod with BitCode for iOS and OSX"
+  s.summary      = "OpenSSL Libraries and CocoaPod without Bitcode for iOS and OSX"
   s.description  = "OpenSSL is an SSL/TLS and Crypto toolkit. Deprecated in Mac OS and gone in iOS, this spec gives your project non-deprecated OpenSSL support. Supports OSX and iOS including Simulator (armv7, arm64, i386, x86_64)."
   s.homepage     = "https://github.com/bither/OpenSSL"
   s.license	     = { :type => 'OpenSSL (OpenSSL/SSLeay)', :file => 'LICENSE' }

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This script downlaods and builds the iOS and Mac openSSL libraries with Bitcode enabled
+# This script downlaods and builds the iOS and Mac openSSL libraries without Bitcode enabled
 
 # Credits:
 # https://github.com/st3fan/ios-openssl
@@ -9,7 +9,7 @@
 
 set -e
 
-SDK_VERSION="9.0"
+SDK_VERSION="18.0"
 MIN_SDK_VERSION="7.0"
 
 OPENSSL_VERSION="openssl-1.0.1j"
@@ -19,19 +19,24 @@ buildMac()
 {
    ARCH=$1
 
-   echo "Building ${OPENSSL_VERSION} for ${ARCH}"
+   echo "Building ${OPENSSL_VERSION} for mac ${ARCH}"
 
    TARGET="darwin-i386-cc"
 
    if [[ $ARCH == "x86_64" ]]; then
       TARGET="darwin64-x86_64-cc"
    fi
 
-   export CC="${BUILD_TOOLS}/usr/bin/clang -fembed-bitcode"
+   export CROSS_TOP="${DEVELOPER}/Platforms/MacOSX.platform/Developer"
+   export CROSS_SDK="MacOSX.sdk"
+
+   export BUILD_TOOLS="${DEVELOPER}"
+   export CC="${BUILD_TOOLS}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
 
    pushd . > /dev/null
    cd "${OPENSSL_VERSION}"
    ./Configure no-asm ${TARGET} --openssldir="/tmp/${OPENSSL_VERSION}-${ARCH}" &> "/tmp/${OPENSSL_VERSION}-${ARCH}.log"
+   sed -ie "/^CFLAG=/s|$| -isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK}|" "Makefile"
    make >> "/tmp/${OPENSSL_VERSION}-${ARCH}.log" 2>&1
    make install >> "/tmp/${OPENSSL_VERSION}-${ARCH}.log" 2>&1
    make clean >> "/tmp/${OPENSSL_VERSION}-${ARCH}.log" 2>&1
@@ -49,14 +54,14 @@ buildIOS()
       PLATFORM="iPhoneSimulator"
    else
       PLATFORM="iPhoneOS"
-      sed -ie "s!static volatile sig_atomic_t intr_signal;!static volatile intr_signal;!" "crypto/ui/ui_openssl.c"
+      # sed -ie "s!static volatile sig_atomic_t intr_signal;!static volatile intr_signal;!" "crypto/ui/ui_openssl.c"
    fi
 
    export $PLATFORM
    export CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
    export CROSS_SDK="${PLATFORM}${SDK_VERSION}.sdk"
    export BUILD_TOOLS="${DEVELOPER}"
-   export CC="${BUILD_TOOLS}/usr/bin/gcc -fembed-bitcode -arch ${ARCH}"
+   export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}"
 
    echo "Building ${OPENSSL_VERSION} for ${PLATFORM} ${SDK_VERSION} ${ARCH}"
 
@@ -90,28 +95,16 @@ rm -rf "/tmp/${OPENSSL_VERSION}-*.log"
 rm -rf "${OPENSSL_VERSION}"
 
 if [ ! -e ${OPENSSL_VERSION}.tar.gz ]; then
-   echo "Downloading ${OPENSSL_VERSION}.tar.gz"
-   curl -O http://www.openssl.org/source/${OPENSSL_VERSION}.tar.gz
+   url="https://github.com/openssl/openssl/releases/download/$(echo $OPENSSL_VERSION | sed 's/[.-]/_/g' | sed 's/openssl/OpenSSL/g')/${OPENSSL_VERSION}.tar.gz"
+   echo "Downloading ${OPENSSL_VERSION}.tar.gz from ${url}"
+   wget $url
 else
    echo "Using ${OPENSSL_VERSION}.tar.gz"
 fi
 
 echo "Unpacking openssl"
-tar xfz "${OPENSSL_VERSION}.tar.gz"
-
-buildMac "x86_64"
+tar xzf "${OPENSSL_VERSION}.tar.gz"
 
-echo "Copying headers"
-cp /tmp/${OPENSSL_VERSION}-x86_64/include/openssl/* include-osx/openssl/
-
-echo "Building Mac libraries"
-lipo \
-   "/tmp/${OPENSSL_VERSION}-x86_64/lib/libcrypto.a" \
-   -create -output lib-osx/libcrypto.a
-
-lipo \
-   "/tmp/${OPENSSL_VERSION}-x86_64/lib/libssl.a" \
-   -create -output lib-osx/libssl.a
 
 buildIOS "armv7"
 buildIOS "arm64"
@@ -125,25 +118,31 @@ echo "Building iOS libraries"
 lipo \
    "/tmp/${OPENSSL_VERSION}-iOS-armv7/lib/libcrypto.a" \
    "/tmp/${OPENSSL_VERSION}-iOS-i386/lib/libcrypto.a" \
+   "/tmp/${OPENSSL_VERSION}-iOS-arm64/lib/libcrypto.a" \
+   "/tmp/${OPENSSL_VERSION}-iOS-x86_64/lib/libcrypto.a" \
    -create -output lib-ios/libcrypto.a
 
 lipo \
    "/tmp/${OPENSSL_VERSION}-iOS-armv7/lib/libssl.a" \
    "/tmp/${OPENSSL_VERSION}-iOS-i386/lib/libssl.a" \
+   "/tmp/${OPENSSL_VERSION}-iOS-arm64/lib/libssl.a" \
+   "/tmp/${OPENSSL_VERSION}-iOS-x86_64/lib/libssl.a" \
    -create -output lib-ios/libssl.a
 
-   echo "Adding 64-bit libraries"
-   lipo \
-      "lib-ios/libcrypto.a" \
-      "/tmp/${OPENSSL_VERSION}-iOS-arm64/lib/libcrypto.a" \
-      "/tmp/${OPENSSL_VERSION}-iOS-x86_64/lib/libcrypto.a" \
-      -create -output lib-ios/libcrypto.a
-
-   lipo \
-      "lib-ios/libssl.a" \
-      "/tmp/${OPENSSL_VERSION}-iOS-arm64/lib/libssl.a" \
-      "/tmp/${OPENSSL_VERSION}-iOS-x86_64/lib/libssl.a" \
-      -create -output lib-ios/libssl.a
+
+buildMac "x86_64"
+
+echo "Copying headers"
+cp /tmp/${OPENSSL_VERSION}-x86_64/include/openssl/* include-osx/openssl/
+
+echo "Building Mac libraries"
+lipo \
+   "/tmp/${OPENSSL_VERSION}-x86_64/lib/libcrypto.a" \
+   -create -output lib-osx/libcrypto.a
+
+lipo \
+   "/tmp/${OPENSSL_VERSION}-x86_64/lib/libssl.a" \
+   -create -output lib-osx/libssl.a
 
 echo "Cleaning up"
 rm -rf /tmp/${OPENSSL_VERSION}-*