passepartoutvpn
/
openssl-apple
mirror of https://github.com/passepartoutvpn/openssl-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prefix iOS archs for consistency

This commit is contained in:
Davide De Rosa 2017-10-14 23:56:08 +02:00
parent e455f1a1ae
commit fbef7e0dca
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-libssl.sh
View File

@ -28,7 +28,7 @@ set -u
DEFAULTVERSION="1.0.2l" DEFAULTVERSION="1.0.2l"
# Default (=full) set of architectures (OpenSSL <= 1.0.2) or targets (OpenSSL >= 1.1.0) to build # Default (=full) set of architectures (OpenSSL <= 1.0.2) or targets (OpenSSL >= 1.1.0) to build
DEFAULTARCHS="x86_64 i386 arm64 armv7s armv7 tv_x86_64 tv_arm64 mac_x86_64 mac_i386" DEFAULTARCHS="ios_x86_64 ios_i386 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64 mac_i386"
DEFAULTTARGETS="ios-sim-cross-x86_64 ios-sim-cross-i386 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64 macos-i386" DEFAULTTARGETS="ios-sim-cross-x86_64 ios-sim-cross-i386 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64 macos-i386"
# Minimum iOS/tvOS SDK version to build for # Minimum iOS/tvOS SDK version to build for

3
config/20-ios-tvos-cross.conf
View File

@ -1,8 +1,7 @@
## -*- mode: perl; -*- ## -*- mode: perl; -*-
## iOS configuration targets
%targets = ( %targets = (
## Base settings for iOS-tvOS cross-compile ## Base settings for cross-compile
# Based on 10-main.conf: iphoneos-cross # Based on 10-main.conf: iphoneos-cross
# Add generic compiler flags # Add generic compiler flags
# Add embed-bitcode option if SDK version is 9 or higher # Add embed-bitcode option if SDK version is 9 or higher

13
scripts/build-loop-archs.sh
View File

@ -31,24 +31,21 @@ do
fi fi
# Determine platform, override arch for tvOS builds # Determine platform, override arch for tvOS builds
if [[ "${ARCH}" == "i386" || "${ARCH}" == "x86_64" ]]; then if [[ "${ARCH}" == "ios_x86_64" || "${ARCH}" == "ios_i386" ]]; then
PLATFORM="iPhoneSimulator" PLATFORM="iPhoneSimulator"
elif [ "${ARCH}" == "tv_x86_64" ]; then elif [ "${ARCH}" == "tv_x86_64" ]; then
ARCH="x86_64"
PLATFORM="AppleTVSimulator" PLATFORM="AppleTVSimulator"
elif [ "${ARCH}" == "tv_arm64" ]; then elif [ "${ARCH}" == "tv_arm64" ]; then
ARCH="arm64"
PLATFORM="AppleTVOS" PLATFORM="AppleTVOS"
elif [ "${ARCH}" == "mac_x86_64" ]; then elif [[ "${ARCH}" == "mac_x86_64" || "${ARCH}" == "mac_i386" ]]; then
ARCH="x86_64"
PLATFORM="MacOSX"
elif [ "${ARCH}" == "mac_i386" ]; then
ARCH="i386"
PLATFORM="MacOSX" PLATFORM="MacOSX"
else else
PLATFORM="iPhoneOS" PLATFORM="iPhoneOS"
fi fi
# Extract ARCH from pseudo ARCH (part after first underscore)
ARCH=$(echo "${ARCH}" | sed -E 's|^[^_]*_(.+)$|\1|g')
# Set env vars for Configure # Set env vars for Configure
export CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer" export CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
export CROSS_SDK="${PLATFORM}${SDKVERSION}.sdk" export CROSS_SDK="${PLATFORM}${SDKVERSION}.sdk"