From dc741032ef73f95c575be1144cefc8d0e19feade Mon Sep 17 00:00:00 2001
From: Jonny <jonathan.r.paton@googlemail.com>
Date: Fri, 13 Feb 2026 22:51:26 +0000
Subject: [PATCH] [openssl] Support universal mac builds (#49960)

---
 ports/openssl/unix/portfile.cmake | 4 ++++
 ports/openssl/vcpkg.json          | 2 +-
 versions/baseline.json            | 2 +-
 versions/o-/openssl.json          | 5 +++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake
index 9127824698..863deef48d 100644
--- a/ports/openssl/unix/portfile.cmake
+++ b/ports/openssl/unix/portfile.cmake
@@ -77,6 +77,10 @@ elseif(VCPKG_TARGET_IS_TVOS OR VCPKG_TARGET_IS_WATCHOS)
     # disable that makes linkage error (e.g. require stderr usage)
     list(APPEND CONFIGURE_OPTIONS no-ui no-asm)
 elseif(VCPKG_TARGET_IS_OSX)
+    # Universal builds don't support ASM
+    if(VCPKG_OSX_ARCHITECTURES MATCHES "arm64" AND VCPKG_OSX_ARCHITECTURES MATCHES "x86_64")
+        list(APPEND CONFIGURE_OPTIONS no-asm)
+    endif()
     if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
         set(OPENSSL_ARCH darwin64-arm64)
     else()
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index ecf24db187..fed38e077f 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version": "3.6.1",
-  "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",
diff --git a/versions/baseline.json b/versions/baseline.json
index 74ecc01256..9ceb1a379a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7290,7 +7290,7 @@
     },
     "openssl": {
       "baseline": "3.6.1",
-      "port-version": 1
+      "port-version": 2
     },
     "opensubdiv": {
       "baseline": "3.5.0",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 3c362dcd75..d0666cfa37 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "13ecbd590e54cff1467a8196b5f0dcab74ae1c24",
+      "version": "3.6.1",
+      "port-version": 2
+    },
     {
       "git-tree": "e21dbecc6f01203cf4c0bf0f02f390ef38aaf25b",
       "version": "3.6.1",