version 3.0.16

Author: apotocki

openssl-iosx.podspec

@@ -6,12 +6,21 @@ Pod::Spec.new do |s|
     s.license      = "Apache"
     s.author       = { "Alexander Pototskiy" => "[email protected]" }
     s.social_media_url = "https://www.linkedin.com/in/alexander-pototskiy"
-    s.osx.deployment_target = "11.0"
     s.ios.deployment_target = "13.4"
+    s.osx.deployment_target = "11.0"
+    s.tvos.deployment_target = "13.0"
+    s.watchos.deployment_target = "11.0"
     s.visionos.deployment_target = "1.0"
-    s.osx.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
     s.ios.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
+    s.osx.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
+    s.tvos.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
+    s.watchos.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
     s.visionos.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
+    s.ios.user_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
+    s.osx.user_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
+    s.tvos.user_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
+    s.watchos.user_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
+    s.visionos.user_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
     s.static_framework = true
     s.prepare_command = "sh scripts/build.sh"
     s.source       = { :git => "https://github.com/apotocki/openssl-iosx.git", :tag => "#{s.version}" }

scripts/build.sh

@@ -119,7 +119,7 @@ function arc()
 	fi
 }
 
-LIBS_TO_BUILD="ssl crypto"
+LIBS_TO_BUILD="ssl crypto apps"
 build_libs()
 {
     [[ -d $BUILD_DIR/build.$1 ]] && rm -rf $BUILD_DIR/build.$1
@@ -145,14 +145,19 @@ build_libs()
 # (type, arc, c, cflags)
 generic_build()
 {
-    if [[ $REBUILD == true ]] || [[ ! -d $BUILD_DIR/build.$1.$2 ]] || [[ ! -f $BUILD_DIR/build.$1.$2.success ]]; then
+    if [[ $REBUILD == true ]] || [[ ! -f $BUILD_DIR/build.$1.$2.success ]] || [[ ! -f $BUILD_DIR/build.$1.$2/libssl.a ]] || [[ ! -f $BUILD_DIR/build.$1.$2/libcrypto.a ]] || [[ ! -f $BUILD_DIR/build.$1.$2/libapps.a ]]; then
         [[ -f $BUILD_DIR/build.$1.$2.success ]] && rm $BUILD_DIR/build.$1.$2.success
         [[ -d $BUILD_DIR/build.$1.$2 ]] && rm -rf $BUILD_DIR/build.$1.$2
         mkdir $BUILD_DIR/build.$1.$2
         pushd $BUILD_DIR/build.$1.$2
         ../$OPENSSL_VER/Configure --openssldir="$BUILD_DIR/build.$1.$2/ssl" no-shared $3 CFLAGS="${4:-}"
-        sed -i '' 's/LIBS=apps\/libapps.a /LIB=/g' Makefile
+        #remove 'fork()' dependence
+        if [[ "$1" == *tvos* ]] || [[ "$1" == *watchos* ]]; then
+            sed -i '' '/apps\/lib\/libapps-lib-http_server.o \\/d' Makefile
+            sed -i '' 's/apps\/lib\/libapps-lib-http_server.o '//g Makefile
+        fi
         make -j$THREAD_COUNT build_libs
+        mv apps/libapps.a ./
         popd
         touch $BUILD_DIR/build.$1.$2.success
     fi
@@ -197,13 +202,14 @@ build_watchossim_libs()
 # (arc, cflags)
 macosx_build()
 {
-if [[ $REBUILD == true ]] || [[ ! -d $BUILD_DIR/build.macosx.$1 ]] || [[ ! -f $BUILD_DIR/build.macosx.$1.success ]]; then
+if [[ $REBUILD == true ]] || [[ ! -f $BUILD_DIR/build.macosx.$1.success ]] || [[ ! -f $BUILD_DIR/build.macosx.$1/libssl.a ]] || [[ ! -f $BUILD_DIR/build.macosx.$1/libcrypto.a ]] || [[ ! -f $BUILD_DIR/build.macosx.$1/libapps.a ]]; then
     [[ -f $BUILD_DIR/build.macosx.$1.success ]] && rm $BUILD_DIR/build.macosx.$1.success
     [[ -d $BUILD_DIR/build.macosx.$1 ]] && rm -rf $BUILD_DIR/build.macosx.$1
     mkdir $BUILD_DIR/build.macosx.$1
     pushd $BUILD_DIR/build.macosx.$1
     ../$OPENSSL_VER/Configure --prefix="$BUILD_DIR/macosx-native" --openssldir="$BUILD_DIR/build.macosx.$1/ssl" no-shared darwin64-$1-cc CFLAGS="$2"
 	make -j$THREAD_COUNT
+    mv apps/libapps.a ./
     popd
     touch $BUILD_DIR/build.macosx.$1.success
 fi