From 99e78152fa4eb9013403112a4a8a3b49bb6ce3f2 Mon Sep 17 00:00:00 2001 From: crueter Date: Wed, 12 Nov 2025 14:29:58 -0500 Subject: [PATCH] [externals] OpenSSL -> v3.6.0-e3608d80df macos-universal, mingw w/proper linking Signed-off-by: crueter --- CMakeLists.txt | 6 ++++-- cpmfile.json | 9 ++------- tools/cpm/check-updates.sh | 6 +++++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5f30a687b..76a946d389 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,17 +155,19 @@ if (YUZU_STATIC_BUILD) set(YUZU_USE_BUNDLED_FFMPEG ON) set(YUZU_USE_BUNDLED_SDL2 ON) + set(YUZU_USE_BUNDLED_OPENSSL ON) set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF) elseif(APPLE) # these libs do not properly provide static libs/let you do it with cmake set(YUZU_USE_CPM ON) - # IMPORTED_IMPLIB not set for imported target - # TODO(crueter): wtf set(YUZU_USE_BUNDLED_FFMPEG ON) set(YUZU_USE_EXTERNAL_SDL2 ON) + set(YUZU_USE_BUNDLED_OPENSSL ON) + # IMPORTED_IMPLIB not set for imported target + # TODO(crueter): wtf set(fmt_FORCE_BUNDLED ON) set(SPIRV-Tools_FORCE_BUNDLED ON) set(SPIRV-Headers_FORCE_BUNDLED ON) diff --git a/cpmfile.json b/cpmfile.json index cb0bfb4487..6cf7ed1a41 100644 --- a/cpmfile.json +++ b/cpmfile.json @@ -4,13 +4,8 @@ "package": "OpenSSL", "name": "openssl", "repo": "crueter-ci/OpenSSL", - "version": "3.6.0", - "min_version": "1.1.1", - "disabled_platforms": [ - "macos-universal", - "mingw-amd64", - "mingw-arm64" - ] + "version": "3.6.0-e3608d80df", + "min_version": "1.1.1" }, "boost": { "package": "Boost", diff --git a/tools/cpm/check-updates.sh b/tools/cpm/check-updates.sh index ae38b7294d..5fc7836199 100755 --- a/tools/cpm/check-updates.sh +++ b/tools/cpm/check-updates.sh @@ -67,7 +67,11 @@ while true; do [ "$REPO" = null ] && continue [ "$GIT_HOST" != "github.com" ] && continue # TODO - # shellcheck disable=SC2153 + + if [ "$CI" = "true" ]; then + TAG="v$VERSION" + fi + [ "$TAG" = null ] && continue echo "-- Package $PACKAGE"