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] Fix build for Android x86. #24801

Closed
wants to merge 3 commits into from
Closed

[openssl] Fix build for Android x86. #24801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd7f0fc
[openssl] Fix build for Android x86.
AenBleidd May 19, 2022
82ef334
Avoid 'crappy' which I assume would fail policheck :)
BillyONeal May 20, 2022
dac551f
Fix version DB
BillyONeal May 20, 2022
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
4 changes: 4 additions & 0 deletions ports/openssl/unix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG)
elseif((CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64"))
set(CFLAGS "${CFLAGS} -mmacosx-version-min=11.0")
endif()
# clang for Android x86 needs a workaround for their implementation of atomics
if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_SYSTEM_NAME STREQUAL "Android" AND VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
set(CFLAGS "${CFLAGS} -DBROKEN_CLANG_ATOMICS")
endif()

string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}")

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.0.3",
"port-version": 2,
"port-version": 3,
"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 @@ -5182,7 +5182,7 @@
},
"openssl": {
"baseline": "3.0.3",
"port-version": 2
"port-version": 3
},
"openssl-unix": {
"baseline": "1.1.1h",
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": "03f8e7e77fd71aaf31af19896c07deaa58b02662",
"version": "3.0.3",
"port-version": 3
},
{
"git-tree": "cdd8b7c5c9ebba05598bc90a58f224f13cf0b611",
"version": "3.0.3",
Expand Down