mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[openssl] Fix armv8 asm [fastrtps] Fix configure race (#33515)
This commit is contained in:
parent
2364f74e8e
commit
be063cfe4a
@ -12,6 +12,7 @@ vcpkg_from_github(
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
DISABLE_PARALLEL_CONFIGURE # due to fix-xtime.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "fastrtps",
|
||||
"version": "2.7.0",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.",
|
||||
"homepage": "https://www.eprosima.com/",
|
||||
"license": "Apache-2.0",
|
||||
|
16
ports/openssl/arm64-asm.patch
Normal file
16
ports/openssl/arm64-asm.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
|
||||
index edb6b04c9a..a945056ab9 100755
|
||||
--- a/crypto/sm4/asm/vpsm4-armv8.pl
|
||||
+++ b/crypto/sm4/asm/vpsm4-armv8.pl
|
||||
@@ -470,9 +470,9 @@ _vpsm4_consts:
|
||||
.long 0xA0A7AEB5, 0xBCC3CAD1, 0xD8DFE6ED, 0xF4FB0209
|
||||
.long 0x10171E25, 0x2C333A41, 0x484F565D, 0x646B7279
|
||||
.Lfk:
|
||||
- .dword 0x56aa3350a3b1bac6,0xb27022dc677d9197
|
||||
+ .quad 0x56aa3350a3b1bac6,0xb27022dc677d9197
|
||||
.Lshuffles:
|
||||
- .dword 0x0B0A090807060504,0x030201000F0E0D0C
|
||||
+ .quad 0x0B0A090807060504,0x030201000F0E0D0C
|
||||
|
||||
.size _vpsm4_consts,.-_vpsm4_consts
|
||||
___
|
@ -21,6 +21,7 @@ vcpkg_from_github(
|
||||
REF "openssl-${VERSION}"
|
||||
SHA512 c48ad86265b0fee18b23863b645a286d131a863a3418c7d2ed6c819eebb822ad0f2985ba3ecbf4def32515442f0eb40aba08f3146d113247e86ec80fbddca1c1
|
||||
PATCHES
|
||||
arm64-asm.patch
|
||||
disable-apps.patch
|
||||
disable-install-docs.patch
|
||||
script-prefix.patch
|
||||
|
@ -45,7 +45,7 @@ vcpkg_list(SET MAKEFILE_OPTIONS)
|
||||
if(VCPKG_TARGET_IS_ANDROID)
|
||||
set(ENV{ANDROID_NDK_ROOT} "${VCPKG_DETECTED_CMAKE_ANDROID_NDK}")
|
||||
set(OPENSSL_ARCH "android-${VCPKG_DETECTED_CMAKE_ANDROID_ARCH}")
|
||||
if((VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" OR VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm64") AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON)
|
||||
if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON)
|
||||
vcpkg_list(APPEND CONFIGURE_OPTIONS no-asm)
|
||||
endif()
|
||||
elseif(VCPKG_TARGET_IS_LINUX)
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "openssl",
|
||||
"version": "3.1.2",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
|
||||
"homepage": "https://www.openssl.org",
|
||||
"license": "Apache-2.0",
|
||||
|
@ -2494,7 +2494,7 @@
|
||||
},
|
||||
"fastrtps": {
|
||||
"baseline": "2.7.0",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"fawdlstty-libfv": {
|
||||
"baseline": "0.0.8",
|
||||
@ -6102,7 +6102,7 @@
|
||||
},
|
||||
"openssl": {
|
||||
"baseline": "3.1.2",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"openssl-unix": {
|
||||
"baseline": "deprecated",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "17e66e986b0296a09cf61691351f381bea310538",
|
||||
"version": "2.7.0",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "443f550810af037dae538dc5555d7e069f2896ec",
|
||||
"version": "2.7.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "11cbc05950decb26474353fb9c0bfed3be3008c4",
|
||||
"version": "3.1.2",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "4e8e2c30ede50b2df35ecf5a0ee574076cfbe06f",
|
||||
"version": "3.1.2",
|
||||
|
Loading…
x
Reference in New Issue
Block a user