Applying @Frugghi enhancements to the 1.0.109 podspec

Author: FredericJacobs

1.0.109/OpenSSL.podspec

@@ -7,36 +7,27 @@ Pod::Spec.new do |s|
   s.homepage        = "https://github.com/FredericJacobs/OpenSSL-Pod"
   s.license         = 'BSD-style Open Source'
   s.source          = { :http => "https://www.openssl.org/source/openssl-1.0.1i.tar.gz", :sha1 => "74eed314fa2c93006df8d26cd9fc630a101abd76"}
-  s.preserve_paths  = "file.tgz", "opensslIncludes/*"
-  s.source_files    = "opensslIncludes/*.h", "**/*.h"
+  s.source_files    = "opensslIncludes/openssl/*.h"
   s.header_dir      = "openssl"
   s.license	        = { :type => 'OpenSSL (OpenSSL/SSLeay)', :file => 'LICENSE' }
 
   s.prepare_command = <<-CMD
     VERSION="1.0.1i"
-    SDKVERSION=`/usr/bin/xcodebuild -version -sdk 2> /dev/null | grep SDKVersion | tail -n 1 |  awk '{ print $2 }'`
+    SDKVERSION=`xcrun --sdk iphoneos --show-sdk-version 2> /dev/null`
 
-    CURRENTPATH=`pwd`
+    BASEPATH="${PWD}"
+    CURRENTPATH="/tmp/openssl"
     ARCHS="i386 x86_64 armv7 armv7s arm64"
     DEVELOPER=`xcode-select -print-path`
 
+    mkdir -p "${CURRENTPATH}"
     mkdir -p "${CURRENTPATH}/bin"
-    mkdir -p "${CURRENTPATH}/lib"
-    mkdir -p "${CURRENTPATH}/opensslIncludes"
-    mkdir -p "${CURRENTPATH}/opensslIncludes/openssl"
 
+    cp "file.tgz" "${CURRENTPATH}/file.tgz"
+    cd "${CURRENTPATH}"
     tar -xzf file.tgz
+    cd "openssl-${VERSION}"
 
-    cd openssl-${VERSION}
-    cd include/openssl
-
-    for link in $(find . -type l)
-      do
-        dir=$(readlink $link)
-        cp $dir ../../../opensslIncludes/openssl
-    done
-
-    cd ../..
     for ARCH in ${ARCHS}
     do
       CONFIGURE_FOR="iphoneos-cross"
@@ -63,32 +54,42 @@ Pod::Spec.new do |s|
       mkdir -p "${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk"
       LOG="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/build-openssl-${VERSION}.log"
 
+      LIPO_LIBSSL="${LIPO_LIBSSL} ${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/lib/libssl.a"
+      LIPO_LIBCRYPTO="${LIPO_LIBCRYPTO} ${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/lib/libcrypto.a"
+
       ./Configure ${CONFIGURE_FOR} --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1
       sed -ie "s!^CFLAG=!CFLAG=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} !" "Makefile"
 
       make >> "${LOG}" 2>&1
-      make install >> "${LOG}" 2>&1
+      make all install_sw >> "${LOG}" 2>&1
       make clean >> "${LOG}" 2>&1
     done
 
 
     echo "Build library..."
-    lipo -create ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-i386.sdk/lib/libssl.a ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-x86_64.sdk/lib/libssl.a  ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7.sdk/lib/libssl.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7s.sdk/lib/libssl.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-arm64.sdk/lib/libssl.a -output ${CURRENTPATH}/lib/libssl.a
-    lipo -create ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-i386.sdk/lib/libcrypto.a ${CURRENTPATH}/bin/iPhoneSimulator${SDKVERSION}-x86_64.sdk/lib/libcrypto.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7.sdk/lib/libcrypto.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-armv7s.sdk/lib/libcrypto.a ${CURRENTPATH}/bin/iPhoneOS${SDKVERSION}-arm64.sdk/lib/libcrypto.a -output ${CURRENTPATH}/lib/libcrypto.a
+    rm -rf "${BASEPATH}/lib/"
+    mkdir -p "${BASEPATH}/lib/"
+    lipo -create ${LIPO_LIBSSL}    -output "${BASEPATH}/lib/libssl.a"
+    lipo -create ${LIPO_LIBCRYPTO} -output "${BASEPATH}/lib/libcrypto.a"
+
+    echo "Copying headers..."
+    rm -rf "${BASEPATH}/opensslIncludes/"
+    mkdir -p "${BASEPATH}/opensslIncludes/"
+    cp -RL "${CURRENTPATH}/openssl-${VERSION}/include/openssl" "${BASEPATH}/opensslIncludes/"
 
+    cd "${BASEPATH}"
     echo "Building done."
+
     echo "Cleaning up..."
-    rm -rf ${CURRENTPATH}/openssl-${VERSION}
-    rm -R ${CURRENTPATH}/bin
-    rm -rf file.tgz
+    rm -rf "${CURRENTPATH}"
     echo "Done."
   CMD
 
   s.ios.platform            = :ios
-  s.ios.public_header_files = "opensslIncludes/*.h"
+  s.ios.public_header_files = "opensslIncludes/openssl/*.h"
   s.ios.vendored_libraries  = "lib/libcrypto.a", "lib/libssl.a"
 
-  s.libraries	            = 'crypto', 'ssl'
-  s.requires_arc            = false
+  s.libraries             = 'crypto', 'ssl'
+  s.requires_arc          = false
 
 end