mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 02:22:52 +08:00
[openssl] Set linux-x32 for emscripten (#37076)
This commit is contained in:
parent
898b728edc
commit
46e4c4c78c
13
ports/openssl/command-line-length.patch
Normal file
13
ports/openssl/command-line-length.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
|
||||
index 8ddb128..52b9ad6 100644
|
||||
--- a/Configurations/unix-Makefile.tmpl
|
||||
+++ b/Configurations/unix-Makefile.tmpl
|
||||
@@ -1961,7 +1961,7 @@ EOF
|
||||
my @objs = map { platform->obj($_) } @{$args{objs}};
|
||||
my $deps = join(" \\\n" . ' ' x (length($lib) + 2),
|
||||
fill_lines(' ', $COLUMNS - length($lib) - 2, @objs));
|
||||
- my $max_per_call = 500;
|
||||
+ my $max_per_call = ($^O eq 'msys') ? 80 : 500;
|
||||
my @objs_grouped;
|
||||
push @objs_grouped, join(" ", splice @objs, 0, $max_per_call) while @objs;
|
||||
my $fill_lib =
|
@ -21,6 +21,7 @@ vcpkg_from_github(
|
||||
REF "openssl-${VERSION}"
|
||||
SHA512 3eed5903f37ac728522cbb0ea0081f1d5a62d9420366d487f838dc22c31813c58584838400bd3d09518608e1e71bafcb1ff83713d351e4876da6625d5543fef6
|
||||
PATCHES
|
||||
command-line-length.patch
|
||||
script-prefix.patch
|
||||
windows/install-layout.patch
|
||||
windows/install-pdbs.patch
|
||||
|
@ -6,7 +6,7 @@ openssl requires Linux kernel headers from the system package manager.
|
||||
]])
|
||||
endif()
|
||||
|
||||
if(CMAKE_HOST_WIN32)
|
||||
if(VCPKG_HOST_IS_WINDOWS)
|
||||
vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl)
|
||||
set(MAKE "${MSYS_ROOT}/usr/bin/make.exe")
|
||||
set(PERL "${MSYS_ROOT}/usr/bin/perl.exe")
|
||||
@ -88,6 +88,7 @@ elseif(VCPKG_TARGET_IS_MINGW)
|
||||
set(OPENSSL_ARCH mingw)
|
||||
endif()
|
||||
elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
|
||||
set(OPENSSL_ARCH linux-x32)
|
||||
vcpkg_list(APPEND CONFIGURE_OPTIONS
|
||||
threads
|
||||
no-engine
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "openssl",
|
||||
"version": "3.2.1",
|
||||
"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",
|
||||
|
@ -6474,7 +6474,7 @@
|
||||
},
|
||||
"openssl": {
|
||||
"baseline": "3.2.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"openssl-unix": {
|
||||
"baseline": "deprecated",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3dc6df970a3aff9c977032299e481fd9872e0970",
|
||||
"version": "3.2.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "53fb72a19981a3439cd569f58b722ca6cd26e23d",
|
||||
"version": "3.2.1",
|
||||
|
Loading…
Reference in New Issue
Block a user