gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-lang/mono: Fix build w/ cmake-4

Browse Source 
https://gitlab.winehq.org/mono/mono/-/commit/831415ed
https://gitlab.winehq.org/mono/boringssl/-/commit/2153da68

Closes: https://bugs.gentoo.org/957434
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2025-07-01 22:34:02 +02:00
parent f50ddc1f0f
commit 7ee9d9bedd
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dev-lang/mono/files/mono-6.12.0.199-boringssl-cmake4.patch Normal file
View File

@@ -0,0 +1,22 @@
From 2153da68cbe3a3afe5416b4373edc7a64146da13 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Fri, 11 Apr 2025 18:01:12 +0000
Subject: [PATCH] CMakeLists: Fix build on cmake 4.0.
---
external/boringssl/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/external/boringssl/CMakeLists.txt b/external/boringssl/CMakeLists.txt
index eaa59401d..6d8b06e15 100644
--- a/external/boringssl/CMakeLists.txt
+++ b/external/boringssl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.10)
+cmake_minimum_required (VERSION 2.8.10...4.0)
# Defer enabling C and CXX languages.
project (BoringSSL NONE)
--
GitLab

32
dev-lang/mono/files/mono-6.12.0.199-cmake4.patch Normal file
View File

@@ -0,0 +1,32 @@
From 831415edd2a578a2b4851996ca796f47dbc3f2f3 Mon Sep 17 00:00:00 2001
From: Esme Povirk <esme@codeweavers.com>
Date: Fri, 11 Apr 2025 18:08:04 +0000
Subject: [PATCH] btls: Fix build on cmake 4.x.
---
mono/btls/CMakeLists.txt | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt
index 992f41e4c7f..dbad836fc27 100644
--- a/mono/btls/CMakeLists.txt
+++ b/mono/btls/CMakeLists.txt
@@ -1,14 +1,7 @@
-cmake_minimum_required (VERSION 2.8.10)
+cmake_minimum_required (VERSION 2.8.10...4.0)
project (mono-btls)
-if(POLICY CMP0026)
- cmake_policy(SET CMP0026 NEW)
-endif()
-if(POLICY CMP0042)
- cmake_policy(SET CMP0042 NEW)
-endif()
-
enable_language(C)
enable_language(CXX)
--
GitLab

3
dev-lang/mono/mono-6.12.0.199-r2.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.12-try-catch.patch
"${FILESDIR}"/${PN}-6.12.0.122-disable-automagic-ccache.patch
"${FILESDIR}"/${PN}-6.12.0.199-configure-c99.patch
"${FILESDIR}"/${PN}-6.12.0.199-{,boringssl-}cmake4.patch # bug 957434, fixed in git main branch
)
pkg_pretend() {