-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #251 from openziti/tsdk-1.2.1
update [email protected]
- Loading branch information
Showing
37 changed files
with
1,166 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| This entire directory was copied from https://github.com/microsoft/vcpkg/tree/master/ports/openssl, and `unix/portfile.cmake` was modified to enable building arm64 binaries for the iphonesimulator platform: | ||
|
|
||
|
|
||
| ```patch | ||
| index 98c5dcb54..a2c4daafe 100644 | ||
| --- a/ports/openssl/unix/portfile.cmake | ||
| +++ b/ports/openssl/unix/portfile.cmake | ||
| @@ -61,15 +61,19 @@ elseif(VCPKG_TARGET_IS_LINUX) | ||
| set(OPENSSL_ARCH linux-generic32) | ||
| endif() | ||
| elseif(VCPKG_TARGET_IS_IOS) | ||
| - if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") | ||
| - set(OPENSSL_ARCH ios64-xcrun) | ||
| + if(VCPKG_OSX_SYSROOT MATCHES "iphonesimulator") | ||
| + set(OPENSSL_ARCH_VARIANT "simulator") | ||
| + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") | ||
| + set(OPENSSL_ARCH_VARIANT 64) | ||
| elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") | ||
| - set(OPENSSL_ARCH ios-xcrun) | ||
| + set(OPENSSL_ARCH_VARIANT "") | ||
| elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR VCPKG_TARGET_ARCHITECTURE MATCHES "x64") | ||
| - set(OPENSSL_ARCH iossimulator-xcrun) | ||
| + set(OPENSSL_ARCH_VARIANT simulator) | ||
| else() | ||
| message(FATAL_ERROR "Unknown iOS target architecture: ${VCPKG_TARGET_ARCHITECTURE}") | ||
| endif() | ||
| + set(OPENSSL_ARCH "ios${OPENSSL_ARCH_VARIANT}-xcrun") | ||
| + message("using openssl arch ${OPENSSL_ARCH}") | ||
| # disable that makes linkage error (e.g. require stderr usage) | ||
| list(APPEND CONFIGURE_OPTIONS no-ui no-asm) | ||
| elseif(VCPKG_TARGET_IS_OSX) | ||
| ``` | ||
|
|
||
| We should submit this change to the vcpkg project, and remove this port-overlay once it's adopted. | ||
| Note that the issue has already been reported: https://github.com/microsoft/vcpkg/issues/24468. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| diff --git a/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl | ||
| index 04b342551c..9b933c70c4 100644 | ||
| --- a/crypto/armv4cpuid.pl | ||
| +++ b/crypto/armv4cpuid.pl | ||
| @@ -293,6 +293,7 @@ atomic_add_spinlock: | ||
| #endif | ||
|
|
||
| .extern OPENSSL_armcap_P | ||
| +.hidden OPENSSL_armcap_P | ||
| ___ | ||
|
|
||
| print $code; | ||
| diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl | ||
| index 17af0e0774..5733a01746 100644 | ||
| --- a/crypto/bn/asm/armv4-gf2m.pl | ||
| +++ b/crypto/bn/asm/armv4-gf2m.pl | ||
| @@ -326,6 +326,7 @@ $code.=<<___; | ||
|
|
||
| #if __ARM_MAX_ARCH__>=7 | ||
| .extern OPENSSL_armcap_P | ||
| +.hidden OPENSSL_armcap_P | ||
| #endif | ||
| ___ | ||
|
|
||
| diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl | ||
| index d85da92406..6e839d845c 100644 | ||
| --- a/crypto/bn/asm/armv4-mont.pl | ||
| +++ b/crypto/bn/asm/armv4-mont.pl | ||
| @@ -750,6 +750,7 @@ $code.=<<___; | ||
| .align 2 | ||
| #if __ARM_MAX_ARCH__>=7 | ||
| .extern OPENSSL_armcap_P | ||
| +.hidden OPENSSL_armcap_P | ||
| #endif | ||
| ___ | ||
|
|
||
| diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl | ||
| index ac32d5bda7..bb48b6eeb9 100755 | ||
| --- a/crypto/chacha/asm/chacha-armv4.pl | ||
| +++ b/crypto/chacha/asm/chacha-armv4.pl | ||
| @@ -1155,6 +1155,7 @@ $code.=<<___; | ||
| ldmia sp!,{r4-r11,pc} | ||
| .size ChaCha20_neon,.-ChaCha20_neon | ||
| .extern OPENSSL_armcap_P | ||
| +.hidden OPENSSL_armcap_P | ||
| #endif | ||
| ___ | ||
| }}} | ||
| diff --git a/crypto/poly1305/asm/poly1305-armv4.pl b/crypto/poly1305/asm/poly1305-armv4.pl | ||
| index b98beefa18..673ea62ec3 100755 | ||
| --- a/crypto/poly1305/asm/poly1305-armv4.pl | ||
| +++ b/crypto/poly1305/asm/poly1305-armv4.pl | ||
| @@ -1240,6 +1240,7 @@ $code.=<<___; | ||
| .align 2 | ||
| #if __ARM_MAX_ARCH__>=7 | ||
| .extern OPENSSL_armcap_P | ||
| +.hidden OPENSSL_armcap_P | ||
| #endif | ||
| ___ | ||
|
|
||
| diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl | ||
| index 2832c5b530..b3a8ec6941 100644 | ||
| --- a/crypto/sha/asm/sha1-armv4-large.pl | ||
| +++ b/crypto/sha/asm/sha1-armv4-large.pl | ||
| @@ -708,6 +708,7 @@ ___ | ||
| $code.=<<___; | ||
| #if __ARM_MAX_ARCH__>=7 | ||
| .extern OPENSSL_armcap_P | ||
| +.hidden OPENSSL_armcap_P | ||
| #endif | ||
| ___ | ||
|
|
||
| diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl | ||
| index 8bac84b1a8..feb1f26109 100644 | ||
| --- a/crypto/sha/asm/sha256-armv4.pl | ||
| +++ b/crypto/sha/asm/sha256-armv4.pl | ||
| @@ -694,6 +694,7 @@ $code.=<<___; | ||
| .align 2 | ||
| #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__) | ||
| .extern OPENSSL_armcap_P | ||
| +.hidden OPENSSL_armcap_P | ||
| #endif | ||
| ___ | ||
|
|
||
| diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl | ||
| index c8b8110671..9aa310ffd0 100644 | ||
| --- a/crypto/sha/asm/sha512-armv4.pl | ||
| +++ b/crypto/sha/asm/sha512-armv4.pl | ||
| @@ -661,6 +661,7 @@ $code.=<<___; | ||
| .align 2 | ||
| #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__) | ||
| .extern OPENSSL_armcap_P | ||
| +.hidden OPENSSL_armcap_P | ||
| #endif | ||
| ___ | ||
|
|
Oops, something went wrong.