Skip to content

Commit df65b78

Browse files
committed
WIP:openssl
1 parent 3426a5e commit df65b78

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

ports/openssl/unix/portfile.cmake

+7-1
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,19 @@ elseif(VCPKG_TARGET_IS_MINGW)
8989
elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
9090
set(OPENSSL_ARCH linux-x32)
9191
vcpkg_list(APPEND CONFIGURE_OPTIONS
92-
threads
9392
no-engine
9493
no-asm
9594
no-sse2
9695
no-srtp
9796
--cross-compile-prefix=
9897
)
98+
# Cf. https://emscripten.org/docs/porting/pthreads.html:
99+
# For Pthreads support, not just openssl but everything
100+
# must be compiled and linked with `-pthread`.
101+
# This makes it a triplet/toolchain-wide setting.
102+
if(NOT " ${VCPKG_DETECTED_CMAKE_C_FLAGS} " MATCHES " -pthread ")
103+
vcpkg_list(APPEND CONFIGURE_OPTIONS no-threads)
104+
endif()
99105
else()
100106
message(FATAL_ERROR "Unknown platform")
101107
endif()

ports/openssl/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "openssl",
33
"version": "3.4.0",
4-
"port-version": 1,
4+
"port-version": 2,
55
"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.",
66
"homepage": "https://www.openssl.org",
77
"license": "Apache-2.0",

versions/baseline.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6770,7 +6770,7 @@
67706770
},
67716771
"openssl": {
67726772
"baseline": "3.4.0",
6773-
"port-version": 1
6773+
"port-version": 2
67746774
},
67756775
"opensubdiv": {
67766776
"baseline": "3.5.0",

versions/o-/openssl.json

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "45588fdc81fd5b293cc4729cef3f239d9fb3071c",
5+
"version": "3.4.0",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "facccb0b0c47f9804b6e336096d0985c3e541eec",
510
"version": "3.4.0",

0 commit comments

Comments
 (0)