From ce526f94aad2b815ae46398124279c323f0cb0ac Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 28 Aug 2025 23:07:25 +0200 Subject: [PATCH] apple-xcframework.sh: remove support for iOS32 --- dist-build/apple-xcframework.sh | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/dist-build/apple-xcframework.sh b/dist-build/apple-xcframework.sh index a7447a5f..76d97e13 100755 --- a/dist-build/apple-xcframework.sh +++ b/dist-build/apple-xcframework.sh @@ -4,8 +4,6 @@ export PREFIX="$(pwd)/libsodium-apple" export MACOS_ARM64_PREFIX="${PREFIX}/tmp/macos-arm64" export MACOS_ARM64E_PREFIX="${PREFIX}/tmp/macos-arm64e" export MACOS_X86_64_PREFIX="${PREFIX}/tmp/macos-x86_64" -export IOS32_PREFIX="${PREFIX}/tmp/ios32" -export IOS32s_PREFIX="${PREFIX}/tmp/ios32s" export IOS64_PREFIX="${PREFIX}/tmp/ios64" export IOS64E_PREFIX="${PREFIX}/tmp/ios64e" export IOS_SIMULATOR_ARM64_PREFIX="${PREFIX}/tmp/ios-simulator-arm64" @@ -61,9 +59,6 @@ else export LIBSODIUM_ENABLE_MINIMAL_FLAG="" fi -IOS32_SUPPORTED=false -[ "$(echo "$IOS_VERSION_MIN" | cut -d'.' -f1)" -lt "11" ] && IOS32_SUPPORTED=true - I386_SIMULATOR_SUPPORTED=false [ "$(echo "$IOS_SIMULATOR_VERSION_MIN" | cut -d'.' -f1)" -lt "11" ] && I386_SIMULATOR_SUPPORTED=true @@ -117,26 +112,6 @@ build_ios() { export PATH="${BASEDIR}/usr/bin:$BASEDIR/usr/sbin:$PATH" export SDK="${BASEDIR}/SDKs/iPhoneOS.sdk" - if [ "$IOS32_SUPPORTED" = true ]; then - ## 32-bit iOS - export CFLAGS="-O3 -mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}" - export LDFLAGS="-mthumb -arch armv7 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}" - - make distclean >/dev/null 2>&1 - ./configure --host=arm-apple-darwin23 --prefix="$IOS32_PREFIX" \ - ${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1 - make -j${PROCESSORS} install || exit 1 - - ## 32-bit armv7s iOS - export CFLAGS="-O3 -mthumb -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}" - export LDFLAGS="-mthumb -arch armv7s -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}" - - make distclean >/dev/null 2>&1 - ./configure --host=arm-apple-darwin23 --prefix="$IOS32s_PREFIX" \ - ${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1 - make -j${PROCESSORS} install || exit 1 - fi - ## 64-bit iOS export CFLAGS="-O3 -arch arm64 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}" export LDFLAGS="-arch arm64 -isysroot ${SDK} -mios-version-min=${IOS_VERSION_MIN}" @@ -475,10 +450,6 @@ cp -a "${IOS64_PREFIX}/include" "${PREFIX}/ios/" for ext in a dylib; do LIBRARY_PATHS="$IOS64_PREFIX/lib/libsodium.${ext}" LIBRARY_PATHS="$LIBRARY_PATHS $IOS64E_PREFIX/lib/libsodium.${ext}" - if [ "$IOS32_SUPPORTED" = true ]; then - LIBRARY_PATHS="$LIBRARY_PATHS $IOS32_PREFIX/lib/libsodium.${ext}" - LIBRARY_PATHS="$LIBRARY_PATHS $IOS32s_PREFIX/lib/libsodium.${ext}" - fi lipo -create \ ${LIBRARY_PATHS} \ -output "$PREFIX/ios/lib/libsodium.${ext}"