Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[openssl] emscripten toolchain controls thread support #43671

Merged
merged 1 commit into from
Feb 11, 2025
Merged

[openssl] emscripten toolchain controls thread support #43671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ports/openssl/unix/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,19 @@ elseif(VCPKG_TARGET_IS_MINGW)
elseif(VCPKG_TARGET_IS_EMSCRIPTEN)
set(OPENSSL_ARCH linux-x32)
vcpkg_list(APPEND CONFIGURE_OPTIONS
threads
no-engine
no-asm
no-sse2
no-srtp
--cross-compile-prefix=
)
# Cf. https://emscripten.org/docs/porting/pthreads.html:
# For Pthreads support, not just openssl but everything
# must be compiled and linked with `-pthread`.
# This makes it a triplet/toolchain-wide setting.
if(NOT " ${VCPKG_DETECTED_CMAKE_C_FLAGS} " MATCHES " -pthread ")
vcpkg_list(APPEND CONFIGURE_OPTIONS no-threads)
endif()
else()
message(FATAL_ERROR "Unknown platform")
endif()
Expand Down
2 changes: 1 addition & 1 deletion ports/openssl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openssl",
"version": "3.4.0",
"port-version": 1,
"port-version": 2,
"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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6770,7 +6770,7 @@
},
"openssl": {
"baseline": "3.4.0",
"port-version": 1
"port-version": 2
},
"opensubdiv": {
"baseline": "3.5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openssl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "45588fdc81fd5b293cc4729cef3f239d9fb3071c",
"version": "3.4.0",
"port-version": 2
},
{
"git-tree": "facccb0b0c47f9804b6e336096d0985c3e541eec",
"version": "3.4.0",
Expand Down