mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 00:11:48 +08:00
[openssl] Fix win64 perlasm scheme (#32957)
* [openssl] Fix win64 perlasm scheme * CI
This commit is contained in:
parent
56a44f3181
commit
b2e069bb3e
@ -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
|
||||
|
@ -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",
|
||||
|
39
ports/openssl/windows/perlasm-scheme.patch
Normal file
39
ports/openssl/windows/perlasm-scheme.patch
Normal 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" => {
|
@ -6082,7 +6082,7 @@
|
||||
},
|
||||
"openssl": {
|
||||
"baseline": "3.1.2",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"openssl-unix": {
|
||||
"baseline": "deprecated",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "5a99562f8ac47a68a58efba5f0d40259fedeecc5",
|
||||
"version": "3.1.2",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "db4486fff3146088dd150f067ebf940c649ffe42",
|
||||
"version": "3.1.2",
|
||||
|
Loading…
Reference in New Issue
Block a user