diff --git a/build.sh b/build.sh index 451ca64..6d0b24c 100755 --- a/build.sh +++ b/build.sh @@ -13,9 +13,9 @@ set -e # EDIT this section to Select Default Versions # ################################################ -OPENSSL="1.1.1p" # https://www.openssl.org/source/ -LIBCURL="7.84.0" # https://curl.haxx.se/download.html -NGHTTP2="1.48.0" # https://nghttp2.org/ +OPENSSL="1.1.1t" # https://www.openssl.org/source/ +LIBCURL="8.0.1" # https://curl.haxx.se/download.html +NGHTTP2="1.52.0" # https://nghttp2.org/ ################################################ @@ -24,11 +24,11 @@ BUILD_MACHINE=`uname -m` BUILD_CMD=$* # Set minimum OS versions for target -MACOS_X86_64_VERSION="" # Empty = use host version -MACOS_ARM64_VERSION="" # Min supported is MacOS 11.0 Big Sur +MACOS_X86_64_VERSION="12.0" # Empty = use host version +MACOS_ARM64_VERSION="12.0" # Min supported is MacOS 11.0 Big Sur CATALYST_IOS="15.0" # Min supported is iOS 15.0 for Mac Catalyst -IOS_MIN_SDK_VERSION="8.0" -TVOS_MIN_SDK_VERSION="9.0" +IOS_MIN_SDK_VERSION="13.0" +TVOS_MIN_SDK_VERSION="13.0" # Semantic Version Comparison version_lte() { diff --git a/curl/libcurl-build.sh b/curl/libcurl-build.sh index 72f2ad3..d0c06c8 100755 --- a/curl/libcurl-build.sh +++ b/curl/libcurl-build.sh @@ -549,50 +549,38 @@ lipo \ fi echo -e "${bold}Building iOS libraries (bitcode)${dim}" -buildIOS "armv7" "bitcode" -buildIOS "armv7s" "bitcode" + buildIOS "arm64" "bitcode" buildIOS "arm64e" "bitcode" lipo \ - "/tmp/${CURL_VERSION}-iOS-armv7-bitcode/lib/libcurl.a" \ - "/tmp/${CURL_VERSION}-iOS-armv7s-bitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-arm64-bitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-arm64e-bitcode/lib/libcurl.a" \ -create -output lib/libcurl_iOS.a -buildIOSsim "i386" "bitcode" buildIOSsim "x86_64" "bitcode" buildIOSsim "arm64" "bitcode" lipo \ - "/tmp/${CURL_VERSION}-iOS-simulator-i386-bitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-simulator-x86_64-bitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-simulator-arm64-bitcode/lib/libcurl.a" \ -create -output lib/libcurl_iOS-simulator.a lipo \ - "/tmp/${CURL_VERSION}-iOS-armv7-bitcode/lib/libcurl.a" \ - "/tmp/${CURL_VERSION}-iOS-armv7s-bitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-arm64-bitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-arm64e-bitcode/lib/libcurl.a" \ - "/tmp/${CURL_VERSION}-iOS-simulator-i386-bitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-simulator-x86_64-bitcode/lib/libcurl.a" \ -create -output lib/libcurl_iOS-fat.a if [[ "${NOBITCODE}" == "yes" ]]; then echo -e "${bold}Building iOS libraries (nobitcode)${dim}" - buildIOS "armv7" "nobitcode" - buildIOS "armv7s" "nobitcode" buildIOS "arm64" "nobitcode" buildIOS "arm64e" "nobitcode" buildIOSsim "x86_64" "nobitcode" - buildIOSsim "i386" "nobitcode" lipo \ "/tmp/${CURL_VERSION}-iOS-armv7-nobitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-armv7s-nobitcode/lib/libcurl.a" \ - "/tmp/${CURL_VERSION}-iOS-simulator-i386-nobitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-arm64-nobitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-arm64e-nobitcode/lib/libcurl.a" \ "/tmp/${CURL_VERSION}-iOS-simulator-x86_64-nobitcode/lib/libcurl.a" \ diff --git a/nghttp2/nghttp2-build.sh b/nghttp2/nghttp2-build.sh index c624453..b0701e8 100755 --- a/nghttp2/nghttp2-build.sh +++ b/nghttp2/nghttp2-build.sh @@ -561,33 +561,25 @@ lipo \ fi echo -e "${bold}Building iOS libraries (bitcode)${dim}" -buildIOS "armv7" "bitcode" -buildIOS "armv7s" "bitcode" + buildIOS "arm64" "bitcode" buildIOS "arm64e" "bitcode" buildIOSsim "x86_64" "bitcode" buildIOSsim "arm64" "bitcode" -buildIOSsim "i386" "bitcode" lipo \ - "${NGHTTP2}/iOS/armv7/lib/libnghttp2.a" \ - "${NGHTTP2}/iOS/armv7s/lib/libnghttp2.a" \ - "${NGHTTP2}/iOS-simulator/i386/lib/libnghttp2.a" \ "${NGHTTP2}/iOS/arm64/lib/libnghttp2.a" \ "${NGHTTP2}/iOS/arm64e/lib/libnghttp2.a" \ "${NGHTTP2}/iOS-simulator/x86_64/lib/libnghttp2.a" \ -create -output "${NGHTTP2}/lib/libnghttp2_iOS-fat.a" lipo \ - "${NGHTTP2}/iOS/armv7/lib/libnghttp2.a" \ - "${NGHTTP2}/iOS/armv7s/lib/libnghttp2.a" \ "${NGHTTP2}/iOS/arm64/lib/libnghttp2.a" \ "${NGHTTP2}/iOS/arm64e/lib/libnghttp2.a" \ -create -output "${NGHTTP2}/lib/libnghttp2_iOS.a" lipo \ - "${NGHTTP2}/iOS-simulator/i386/lib/libnghttp2.a" \ "${NGHTTP2}/iOS-simulator/x86_64/lib/libnghttp2.a" \ "${NGHTTP2}/iOS-simulator/arm64/lib/libnghttp2.a" \ -create -output "${NGHTTP2}/lib/libnghttp2_iOS-simulator.a" diff --git a/openssl/openssl-build-phase2.sh b/openssl/openssl-build-phase2.sh index 51f83ea..5bb6c05 100755 --- a/openssl/openssl-build-phase2.sh +++ b/openssl/openssl-build-phase2.sh @@ -312,12 +312,10 @@ if [ "$engine" == "1" ]; then fi echo -e "${bold}Building iOS libraries${dim}" -buildIOS "armv7" -buildIOS "armv7s" + buildIOS "arm64" buildIOS "arm64e" -buildIOSsim "i386" buildIOSsim "x86_64" buildIOSsim "arm64" @@ -325,15 +323,11 @@ echo " Copying headers and libraries" cp /tmp/${OPENSSL_VERSION}-iOS-arm64/include/openssl/* iOS/include/openssl/ lipo \ - "/tmp/${OPENSSL_VERSION}-iOS-armv7/lib/libcrypto.a" \ - "/tmp/${OPENSSL_VERSION}-iOS-armv7s/lib/libcrypto.a" \ "/tmp/${OPENSSL_VERSION}-iOS-arm64/lib/libcrypto.a" \ "/tmp/${OPENSSL_VERSION}-iOS-arm64e/lib/libcrypto.a" \ -create -output iOS/lib/libcrypto.a lipo \ - "/tmp/${OPENSSL_VERSION}-iOS-armv7/lib/libssl.a" \ - "/tmp/${OPENSSL_VERSION}-iOS-armv7s/lib/libssl.a" \ "/tmp/${OPENSSL_VERSION}-iOS-arm64/lib/libssl.a" \ "/tmp/${OPENSSL_VERSION}-iOS-arm64e/lib/libssl.a" \ -create -output iOS/lib/libssl.a @@ -342,13 +336,11 @@ lipo \ cp /tmp/${OPENSSL_VERSION}-iOS-Simulator-x86_64/include/openssl/* iOS-simulator/include/openssl/ lipo \ - "/tmp/${OPENSSL_VERSION}-iOS-Simulator-i386/lib/libcrypto.a" \ "/tmp/${OPENSSL_VERSION}-iOS-Simulator-x86_64/lib/libcrypto.a" \ "/tmp/${OPENSSL_VERSION}-iOS-Simulator-arm64/lib/libcrypto.a" \ -create -output iOS-simulator/lib/libcrypto.a lipo \ - "/tmp/${OPENSSL_VERSION}-iOS-Simulator-i386/lib/libssl.a" \ "/tmp/${OPENSSL_VERSION}-iOS-Simulator-x86_64/lib/libssl.a" \ "/tmp/${OPENSSL_VERSION}-iOS-Simulator-arm64/lib/libssl.a" \ -create -output iOS-simulator/lib/libssl.a @@ -356,26 +348,20 @@ lipo \ cp /tmp/${OPENSSL_VERSION}-iOS-arm64/include/openssl/* iOS-fat/include/openssl/ lipo \ - "/tmp/${OPENSSL_VERSION}-iOS-armv7/lib/libcrypto.a" \ - "/tmp/${OPENSSL_VERSION}-iOS-armv7s/lib/libcrypto.a" \ "/tmp/${OPENSSL_VERSION}-iOS-arm64/lib/libcrypto.a" \ "/tmp/${OPENSSL_VERSION}-iOS-arm64e/lib/libcrypto.a" \ - "/tmp/${OPENSSL_VERSION}-iOS-Simulator-i386/lib/libcrypto.a" \ "/tmp/${OPENSSL_VERSION}-iOS-Simulator-x86_64/lib/libcrypto.a" \ -create -output iOS-fat/lib/libcrypto.a lipo \ - "/tmp/${OPENSSL_VERSION}-iOS-armv7/lib/libssl.a" \ - "/tmp/${OPENSSL_VERSION}-iOS-armv7s/lib/libssl.a" \ "/tmp/${OPENSSL_VERSION}-iOS-arm64/lib/libssl.a" \ "/tmp/${OPENSSL_VERSION}-iOS-arm64e/lib/libssl.a" \ "/tmp/${OPENSSL_VERSION}-iOS-Simulator-x86_64/lib/libssl.a" \ - "/tmp/${OPENSSL_VERSION}-iOS-Simulator-i386/lib/libssl.a" \ -create -output iOS-fat/lib/libssl.a echo " Creating combined OpenSSL libraries for iOS" -libtool -no_warning_for_no_symbols -static -o openssl-ios-armv7_armv7s_arm64_arm64e.a iOS/lib/libcrypto.a iOS/lib/libssl.a -libtool -no_warning_for_no_symbols -static -o openssl-ios-i386_x86_64_arm64-simulator.a iOS-simulator/lib/libcrypto.a iOS-simulator/lib/libssl.a +libtool -no_warning_for_no_symbols -static -o openssl-ios-arm64_arm64e.a iOS/lib/libcrypto.a iOS/lib/libssl.a +libtool -no_warning_for_no_symbols -static -o openssl-ios-x86_64_arm64-simulator.a iOS-simulator/lib/libcrypto.a iOS-simulator/lib/libssl.a echo -e "${bold}Cleaning up${dim}" rm -rf /tmp/${OPENSSL_VERSION}-*