fix build fail

yycking · Sep 16, 2020 · fe43a10 · fe43a10
1 parent 264f97e
commit fe43a10
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/build.sh b/build.sh
@@ -6,7 +6,7 @@ PLATFORM=$1
 ACTION=$2
 
 FFMPEG_VERSION=n4.3.1
-OPENSSL_VERSION=be63e58732cedc0bbc39777d1cf7556e55f146ef
+OPENSSL_VERSION=OpenSSL_1_1_1g
 
 # We don't want package managers to mess up the build
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin

diff --git a/scripts/do-compile-ffmpeg.sh b/scripts/do-compile-ffmpeg.sh
@@ -130,25 +130,25 @@ if [ "$FF_PLATFORM" = "iOS" ]; then
         FF_BUILD_NAME="ffmpeg-i386"
         FF_BUILD_NAME_OPENSSL=openssl-i386
         FF_XCRUN_PLATFORM="iPhoneSimulator"
-        FF_XCRUN_OSVERSION="-mios-simulator-version-min=12.0"
+        FF_XCRUN_OSVERSION="-mios-simulator-version-min=8.0"
         FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_FLAGS_INTEL"
     elif [ "$FF_ARCH" = "x86_64" ]; then
         FF_BUILD_NAME="ffmpeg-x86_64"
         FF_BUILD_NAME_OPENSSL=openssl-x86_64
         FF_XCRUN_PLATFORM="iPhoneSimulator"
-        FF_XCRUN_OSVERSION="-mios-simulator-version-min=12.0"
+        FF_XCRUN_OSVERSION="-mios-simulator-version-min=8.0"
         FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_FLAGS_INTEL"
     elif [ "$FF_ARCH" = "armv7" ]; then
         FF_BUILD_NAME="ffmpeg-armv7"
         FF_BUILD_NAME_OPENSSL=openssl-armv7
         FF_XCRUN_PLATFORM="iPhoneOS"
-        FF_XCRUN_OSVERSION="-miphoneos-version-min=12.0"
+        FF_XCRUN_OSVERSION="-miphoneos-version-min=8.0"
         FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_FLAGS_ARM"
     elif [ "$FF_ARCH" = "arm64" ]; then
         FF_BUILD_NAME="ffmpeg-arm64"
         FF_BUILD_NAME_OPENSSL=openssl-arm64
         FF_XCRUN_PLATFORM="iPhoneOS"
-        FF_XCRUN_OSVERSION="-miphoneos-version-min=12.0"
+        FF_XCRUN_OSVERSION="-miphoneos-version-min=8.0"
         FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS $FFMPEG_CFG_FLAGS_ARM"
         FF_GASPP_EXPORT="GASPP_FIX_XCODE5=1"
     elif [ "$FF_ARCH" = "arm64e" ]; then

diff --git a/scripts/do-compile-openssl.sh b/scripts/do-compile-openssl.sh
@@ -91,22 +91,22 @@ if [ "$FF_PLATFORM" = "iOS" ]; then
     if [ "$FF_ARCH" = "i386" ]; then
         FF_BUILD_NAME="openssl-i386"
         FF_XCRUN_PLATFORM="iPhoneSimulator"
-        FF_XCRUN_OSVERSION="-mios-simulator-version-min=12.0"
-        OPENSSL_CFG_FLAGS="darwin-i386-cc no-asm $OPENSSL_CFG_FLAGS"
+        FF_XCRUN_OSVERSION="-mios-simulator-version-min=8.0"
+        OPENSSL_CFG_FLAGS="darwin-i386-cc no-asm no-engine $OPENSSL_CFG_FLAGS"
     elif [ "$FF_ARCH" = "x86_64" ]; then
         FF_BUILD_NAME="openssl-x86_64"
         FF_XCRUN_PLATFORM="iPhoneSimulator"
-        FF_XCRUN_OSVERSION="-mios-simulator-version-min=12.0"
-        OPENSSL_CFG_FLAGS="darwin64-x86_64-cc no-asm $OPENSSL_CFG_FLAGS"
+        FF_XCRUN_OSVERSION="-mios-simulator-version-min=8.0"
+        OPENSSL_CFG_FLAGS="darwin64-x86_64-cc no-asm no-engine $OPENSSL_CFG_FLAGS"
     elif [ "$FF_ARCH" = "armv7" ]; then
         FF_BUILD_NAME="openssl-armv7"
         FF_XCRUN_PLATFORM="iPhoneOS"
-        FF_XCRUN_OSVERSION="-miphoneos-version-min=12.0"
+        FF_XCRUN_OSVERSION="-miphoneos-version-min=8.0"
         OPENSSL_CFG_FLAGS="iphoneos-cross $OPENSSL_CFG_FLAGS"
     elif [ "$FF_ARCH" = "arm64" ]; then
         FF_BUILD_NAME="openssl-arm64"
         FF_XCRUN_PLATFORM="iPhoneOS"
-        FF_XCRUN_OSVERSION="-miphoneos-version-min=12.0"
+        FF_XCRUN_OSVERSION="-miphoneos-version-min=8.0"
         OPENSSL_CFG_FLAGS="iphoneos-cross $OPENSSL_CFG_FLAGS"
     elif [ "$FF_ARCH" = "arm64e" ]; then
         FF_BUILD_NAME="openssl-arm64e"
@@ -141,12 +141,12 @@ elif [ "$FF_PLATFORM" = "tvOS" ]; then
     if [ "$FF_ARCH" = "x86_64" ]; then
         FF_BUILD_NAME="openssl-x86_64"
         FF_XCRUN_PLATFORM="AppleTVSimulator"
-        FF_XCRUN_OSVERSION="-DHAVE_FORK=0 -mtvos-simulator-version-min=12.0"
+        FF_XCRUN_OSVERSION="-DHAVE_FORK=0 -mtvos-simulator-version-min=10.2"
         OPENSSL_CFG_FLAGS="darwin64-x86_64-cc $OPENSSL_CFG_FLAGS"
     elif [ "$FF_ARCH" = "arm64" ]; then
         FF_BUILD_NAME="openssl-arm64"
         FF_XCRUN_PLATFORM="AppleTVOS"
-        FF_XCRUN_OSVERSION="-DHAVE_FORK=0 -mtvos-version-min=12.0"
+        FF_XCRUN_OSVERSION="-DHAVE_FORK=0 -mtvos-version-min=10.2"
         OPENSSL_CFG_FLAGS="iphoneos-cross $OPENSSL_CFG_FLAGS"
     else
         echo "unknown architecture $FF_PLATFORM, $FF_ARCH";
@@ -195,7 +195,7 @@ echo "\n--------------------"
 echo "[*] configurate openssl"
 echo "--------------------"
 
-#OPENSSL_CFG_FLAGS="$OPENSSL_CFG_FLAGS $FF_XCODE_BITCODE"
+OPENSSL_CFG_FLAGS="$OPENSSL_CFG_FLAGS $FF_XCODE_BITCODE"
 OPENSSL_CFG_FLAGS="$OPENSSL_CFG_FLAGS --openssldir=$FF_BUILD_PREFIX --prefix=$FF_BUILD_PREFIX"
 
 # xcode configuration