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

Add arm64 targets 

- New Macs
- Catalyst
- iPhone Simulator
This commit is contained in:
Davide De Rosa 2020-11-11 20:37:03 +01:00
parent 2be1214e3b
commit 2d7d115186
4 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSSL-Apple.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
openssl_version = "1.1.1h" openssl_version = "1.1.1h"
openssl_targets = "ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64" openssl_targets = "ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64"
script_version = "6" script_version = "6"
s.name = "OpenSSL-Apple" s.name = "OpenSSL-Apple"

2
OpenSSL-Apple.podspec.template
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
openssl_version = "%OPENSSL-VERSION%" openssl_version = "%OPENSSL-VERSION%"
openssl_targets = "ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64" openssl_targets = "ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64"
script_version = "6" script_version = "6"
s.name = "OpenSSL-Apple" s.name = "OpenSSL-Apple"

15
build-libssl.sh
View File

@ -29,9 +29,9 @@ DEFAULTVERSION="1.1.1h"
# Default (=full) set of targets (OpenSSL >= 1.1.1) to build # Default (=full) set of targets (OpenSSL >= 1.1.1) to build
DEFAULTTARGETS=`cat <<TARGETS DEFAULTTARGETS=`cat <<TARGETS
ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e
macos64-x86_64 macos64-x86_64 macos64-arm64
mac-catalyst-x86_64 mac-catalyst-x86_64 mac-catalyst-arm64
watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-x86_64 watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-x86_64
tvos-sim-cross-x86_64 tvos64-cross-arm64 tvos-sim-cross-x86_64 tvos64-cross-arm64
TARGETS` TARGETS`
@ -590,12 +590,21 @@ if [ ${#OPENSSLCONF_ALL[@]} -gt 1 ]; then
*_ios_sim_x86_64.h) *_ios_sim_x86_64.h)
DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64" DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64"
;; ;;
*_ios_sim_arm64.h)
DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_ARM64"
;;
*_macos_x86_64.h) *_macos_x86_64.h)
DEFINE_CONDITION="TARGET_OS_OSX && TARGET_CPU_X86_64" DEFINE_CONDITION="TARGET_OS_OSX && TARGET_CPU_X86_64"
;; ;;
*_macos_arm64.h)
DEFINE_CONDITION="TARGET_OS_OSX && TARGET_CPU_ARM64"
;;
*_catalyst_x86_64.h) *_catalyst_x86_64.h)
DEFINE_CONDITION="(TARGET_OS_MACCATALYST || (TARGET_OS_IOS && TARGET_OS_SIMULATOR)) && TARGET_CPU_X86_64" DEFINE_CONDITION="(TARGET_OS_MACCATALYST || (TARGET_OS_IOS && TARGET_OS_SIMULATOR)) && TARGET_CPU_X86_64"
;; ;;
*_catalyst_arm64.h)
DEFINE_CONDITION="(TARGET_OS_MACCATALYST || (TARGET_OS_IOS && TARGET_OS_SIMULATOR)) && TARGET_CPU_ARM64"
;;
*_watchos_armv7k.h) *_watchos_armv7k.h)
DEFINE_CONDITION="TARGET_OS_WATCHOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARMV7K" DEFINE_CONDITION="TARGET_OS_WATCHOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARMV7K"
;; ;;

27
config/20-all-platforms.conf
View File

@ -66,20 +66,47 @@ my %targets = ();
inherit_from => [ "darwin64-x86_64-cc", "ios-cross-base" ], inherit_from => [ "darwin64-x86_64-cc", "ios-cross-base" ],
sys_id => "iOS", sys_id => "iOS",
}, },
# Simulator (arm64)
"ios-sim-cross-arm64" => {
inherit_from => [ "darwin64-arm64-cc", "ios-cross-base" ],
cflags => add("-target arm64-apple-ios13.0-simulator"),
sys_id => "iOS",
},
## Apple macOS ## Apple macOS
# Base (arm64)
"darwin64-arm64-cc" => {
inherit_from => [ "darwin-common" ],
CFLAGS => add("-Wall"),
cflags => add("-arch arm64"),
lib_cppflags => add("-DL_ENDIAN"),
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "macosx",
},
# Device (x86_64) # Device (x86_64)
"macos64-x86_64" => { "macos64-x86_64" => {
inherit_from => [ "darwin64-x86_64-cc", "macos-base" ], inherit_from => [ "darwin64-x86_64-cc", "macos-base" ],
sys_id => "macOS", sys_id => "macOS",
}, },
# Device (arm64)
"macos64-arm64" => {
inherit_from => [ "darwin64-arm64-cc", "macos-base" ],
sys_id => "macOS",
},
# Catalyst (x86_64) # Catalyst (x86_64)
"mac-catalyst-x86_64" => { "mac-catalyst-x86_64" => {
inherit_from => [ "darwin64-x86_64-cc", "mac-catalyst-base" ], inherit_from => [ "darwin64-x86_64-cc", "mac-catalyst-base" ],
cflags => add("-target x86_64-apple-ios13.0-macabi"), cflags => add("-target x86_64-apple-ios13.0-macabi"),
sys_id => "MacOSX", sys_id => "MacOSX",
}, },
# Catalyst (arm64)
"mac-catalyst-arm64" => {
inherit_from => [ "darwin64-arm64-cc", "mac-catalyst-base" ],
cflags => add("-target arm64-apple-ios13.0-macabi "),
sys_id => "MacOSX",
},
## Apple WatchOS ## Apple WatchOS