[openssl] Fix build for Android x86.

OpenSSL3 uses atomics that are broken on clang for Android x86. This commit fixes the build by disabling usage of these atomics on Android x86 only. This fixes microsoft#24021. Signed-off-by: Vitalii Koshura <[email protected]>
AenBleidd · May 19, 2022 · bd7f0fc · bd7f0fc
1 parent 2f0872b
commit bd7f0fc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
@@ -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 has a crappy 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}")
 

diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
@@ -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",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5182,7 +5182,7 @@
     },
     "openssl": {
       "baseline": "3.0.3",
-      "port-version": 2
+      "port-version": 3
     },
     "openssl-unix": {
       "baseline": "1.1.1h",

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f72e602e3fde9d592c2f8d01c4ca0ed21c4df63b",
+      "version": "3.0.3",
+      "port-version": 3
+    },
     {
       "git-tree": "cdd8b7c5c9ebba05598bc90a58f224f13cf0b611",
       "version": "3.0.3",