From df4e4f04f582b1c679c9e7953592fc716baec4b4 Mon Sep 17 00:00:00 2001
From: lizzie <lizzie@eden-emu.dev>
Date: Thu, 16 Oct 2025 07:50:16 +0000
Subject: [PATCH] [compat] solaris build fixes

Signed-off-by: lizzie <lizzie@eden-emu.dev>
---
 .patch/catch2/0001-solaris-isnan-fix.patch | 12 ++++++++++++
 CMakeLists.txt                             |  2 +-
 externals/cpmfile.json                     |  5 +++--
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 .patch/catch2/0001-solaris-isnan-fix.patch

diff --git a/.patch/catch2/0001-solaris-isnan-fix.patch b/.patch/catch2/0001-solaris-isnan-fix.patch
new file mode 100644
index 0000000000..498d6cd93e
--- /dev/null
+++ b/.patch/catch2/0001-solaris-isnan-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/src/catch2/matchers/catch_matchers_floating_point.cpp b/src/catch2/matchers/catch_matchers_floating_point.cpp
+index fc7b444..0e1a3c2 100644
+--- a/src/catch2/matchers/catch_matchers_floating_point.cpp
++++ b/src/catch2/matchers/catch_matchers_floating_point.cpp
+@@ -5,6 +5,7 @@
+ //        https://www.boost.org/LICENSE_1_0.txt)
+ 
+ // SPDX-License-Identifier: BSL-1.0
++#include <catch2/internal/catch_polyfills.hpp>
+ #include <catch2/matchers/catch_matchers_floating_point.hpp>
+ #include <catch2/internal/catch_enforce.hpp>
+ #include <catch2/internal/catch_polyfills.hpp>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa35ca3d16..9faa2dad64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,7 +264,7 @@ if (ENABLE_WEB_SERVICE)
 endif()
 option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})
 if (ENABLE_OPENSSL)
-    cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" "${MSVC}" "NOT ANDROID" ON)
+    cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" ON "MSVC OR PLATFORM_SUN" OFF)
 endif()
 
 if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index 9025ec2787..eaf099df89 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -46,9 +46,10 @@
         "package": "xbyak",
         "repo": "herumi/xbyak",
         "tag": "v%VERSION%",
-        "hash": "e84992c65ad62c577e2746ec5180132fd2875166d1e6b1521a0ff619787e1645792fe5f6a858fe94ed66f297912b6a6b89a509b5d5f5e81a2db1dd7e6790b1f5",
+        "hash": "443c5c0f14182e46b07af18ee5bd631a0557c37c6b92f6b19a3100dcc8f7b8baa100b7f142fc182cb8d74537bd69459f1065b39078a8a8d02f247133c9c46be4",
+        "git_version": "7.28",
         "bundled": true,
-        "git_version": "7.30"
+        "skip_updates": true
     },
     "xbyak": {
         "package": "xbyak",