[openssl] Fix win64 perlasm scheme (#32957)

* [openssl] Fix win64 perlasm scheme

* CI
This commit is contained in:
Kai Pastor 2023-08-07 18:15:49 +02:00 committed by GitHub
parent 56a44f3181
commit b2e069bb3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 1 deletions

View File

@ -26,6 +26,7 @@ vcpkg_from_github(
script-prefix.patch
windows/install-layout.patch
windows/install-pdbs.patch
windows/perlasm-scheme.patch
unix/android-cc.patch
unix/move-openssldir.patch
unix/no-empty-dirs.patch

View File

@ -1,6 +1,7 @@
{
"name": "openssl",
"version": "3.1.2",
"port-version": 1,
"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",

View File

@ -0,0 +1,39 @@
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e8084ab..263ecd0 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -9,19 +9,22 @@ sub vc_win64a_info {
$vc_win64a_info = { AS => "nasm",
ASFLAGS => "-g",
asflags => "-Ox -f win64 -DNEAR",
- asoutflag => "-o " };
+ asoutflag => "-o ",
+ perlasm_scheme => "nasm" };
} elsif ($disabled{asm}) {
# assembler is still used to compile uplink shim
$vc_win64a_info = { AS => "ml64",
ASFLAGS => "/nologo /Zi",
asflags => "/c /Cp /Cx",
- asoutflag => "/Fo" };
+ asoutflag => "/Fo",
+ perlasm_scheme => "masm" };
} else {
$die->("NASM not found - make sure it's installed and available on %PATH%\n");
$vc_win64a_info = { AS => "{unknown}",
ASFLAGS => "",
asflags => "",
- asoutflag => "" };
+ asoutflag => "",
+ perlasm_scheme => "auto" };
}
}
return $vc_win64a_info;
@@ -1493,7 +1496,7 @@ my %targets = (
sys_id => "WIN64A",
uplink_arch => 'x86_64',
asm_arch => 'x86_64',
- perlasm_scheme => "auto",
+ perlasm_scheme => sub { vc_win64a_info()->{perlasm_scheme} },
multilib => "-x64",
},
"VC-WIN32" => {

View File

@ -6082,7 +6082,7 @@
},
"openssl": {
"baseline": "3.1.2",
"port-version": 0
"port-version": 1
},
"openssl-unix": {
"baseline": "deprecated",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5a99562f8ac47a68a58efba5f0d40259fedeecc5",
"version": "3.1.2",
"port-version": 1
},
{
"git-tree": "db4486fff3146088dd150f067ebf940c649ffe42",
"version": "3.1.2",