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

Default to 64-bit only 

- Raise platform targets.
- Drop 32-bit OpenSSL targets.
- Default to 1.1.0
This commit is contained in:
Davide De Rosa 2018-09-26 10:04:57 +02:00
parent 221b6edb30
commit a6958f4c9b
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSSL-Apple.podspec.template
View File

@ -13,9 +13,9 @@ Pod::Spec.new do |s|
./create-openssl-framework.sh dynamic ./create-openssl-framework.sh dynamic
CMD CMD
s.ios.deployment_target = "9.0" s.ios.deployment_target = "11.0"
s.ios.vendored_frameworks = "frameworks/iPhone/openssl.framework" s.ios.vendored_frameworks = "frameworks/iPhone/openssl.framework"
s.tvos.deployment_target = "9.0" s.tvos.deployment_target = "11.0"
s.tvos.vendored_frameworks = "frameworks/AppleTV/openssl.framework" s.tvos.vendored_frameworks = "frameworks/AppleTV/openssl.framework"
s.osx.deployment_target = "10.11" s.osx.deployment_target = "10.11"
s.osx.vendored_frameworks = "frameworks/MacOSX/openssl.framework" s.osx.vendored_frameworks = "frameworks/MacOSX/openssl.framework"

2
assets/AppleTV/Info.plist
View File

@ -19,6 +19,6 @@
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1</string> <string>1</string>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>
<string>9.0</string> <string>11.0</string>
</dict> </dict>
</plist> </plist>

2
assets/iPhone/Info.plist
View File

@ -19,6 +19,6 @@
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1</string> <string>1</string>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>
<string>8.0</string> <string>11.0</string>
</dict> </dict>
</plist> </plist>

12
build-libssl.sh
View File

@ -25,16 +25,18 @@ set -u
# SCRIPT DEFAULTS # SCRIPT DEFAULTS
# Default version in case no version is specified # Default version in case no version is specified
DEFAULTVERSION="1.0.2l" DEFAULTVERSION="1.1.0i"
# 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="ios_x86_64 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64" #DEFAULTARCHS="ios_x86_64 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64"
DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64" #DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64"
DEFAULTARCHS="ios_x86_64 ios_arm64 tv_x86_64 tv_arm64 mac_x86_64"
DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64"
# Minimum iOS/tvOS SDK version to build for # Minimum iOS/tvOS SDK version to build for
MACOS_MIN_SDK_VERSION="10.11" MACOS_MIN_SDK_VERSION="10.11"
IOS_MIN_SDK_VERSION="8.0" IOS_MIN_SDK_VERSION="11.0"
TVOS_MIN_SDK_VERSION="9.0" TVOS_MIN_SDK_VERSION="11.0"
# Init optional env variables (use available variable or default to empty string) # Init optional env variables (use available variable or default to empty string)
CURL_OPTIONS="${CURL_OPTIONS:-}" CURL_OPTIONS="${CURL_OPTIONS:-}"

8
create-openssl-framework.sh
View File

@ -63,15 +63,15 @@ if [ $FWTYPE == "dynamic" ]; then
SDK="${CROSS_TOP}/SDKs/${CROSS_SDK}" SDK="${CROSS_TOP}/SDKs/${CROSS_SDK}"
if [[ $PLATFORM == AppleTVSimulator* ]]; then if [[ $PLATFORM == AppleTVSimulator* ]]; then
MIN_SDK="-tvos_simulator_version_min 9.0" MIN_SDK="-tvos_simulator_version_min 11.0"
elif [[ $PLATFORM == AppleTV* ]]; then elif [[ $PLATFORM == AppleTV* ]]; then
MIN_SDK="-tvos_version_min 9.0" MIN_SDK="-tvos_version_min 11.0"
elif [[ $PLATFORM == MacOSX* ]]; then elif [[ $PLATFORM == MacOSX* ]]; then
MIN_SDK="-macosx_version_min 10.11" MIN_SDK="-macosx_version_min 10.11"
elif [[ $PLATFORM == iPhoneSimulator* ]]; then elif [[ $PLATFORM == iPhoneSimulator* ]]; then
MIN_SDK="-ios_simulator_version_min 8.0" MIN_SDK="-ios_simulator_version_min 11.0"
else else
MIN_SDK="-ios_version_min 8.0" MIN_SDK="-ios_version_min 11.0"
fi fi
#cd $TARGETDIR #cd $TARGETDIR