| 1 |
commit: be02856a46e00bbb861fd3c651cac42c2b7697d0 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 13 01:41:45 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 13 01:42:08 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be02856a |
| 7 |
|
| 8 |
dev-lang/mono: fix automagic ccache usage |
| 9 |
|
| 10 |
This is for users to enable, not for build systems to do it based |
| 11 |
on whether ccache is installed (which leads to sandbox issues anyway). |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/830562 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
.../mono-6.12.0.122-disable-automagic-ccache.patch | 22 ++++++++++++++++++++++ |
| 17 |
dev-lang/mono/mono-6.12.0.122.ebuild | 3 ++- |
| 18 |
2 files changed, 24 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/dev-lang/mono/files/mono-6.12.0.122-disable-automagic-ccache.patch b/dev-lang/mono/files/mono-6.12.0.122-disable-automagic-ccache.patch |
| 21 |
new file mode 100644 |
| 22 |
index 000000000000..b92592f6ea32 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-lang/mono/files/mono-6.12.0.122-disable-automagic-ccache.patch |
| 25 |
@@ -0,0 +1,22 @@ |
| 26 |
+https://bugs.gentoo.org/831079 |
| 27 |
+--- a/mono/btls/CMakeLists.txt |
| 28 |
++++ b/mono/btls/CMakeLists.txt |
| 29 |
+@@ -12,11 +12,6 @@ endif() |
| 30 |
+ enable_language(C) |
| 31 |
+ enable_language(CXX) |
| 32 |
+ |
| 33 |
+-find_program(CCACHE_PROGRAM ccache) |
| 34 |
+-if(CCACHE_PROGRAM) |
| 35 |
+- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") |
| 36 |
+-endif() |
| 37 |
+- |
| 38 |
+ if (MSVC OR CYGWIN) |
| 39 |
+ set(BTLS_HOST_WIN32 1) |
| 40 |
+ endif () |
| 41 |
+@@ -129,4 +124,4 @@ endif () |
| 42 |
+ |
| 43 |
+ if (CYGWIN) |
| 44 |
+ target_link_libraries (mono-btls-shared wsock32 ws2_32) |
| 45 |
+-endif () |
| 46 |
+\ No newline at end of file |
| 47 |
++endif () |
| 48 |
|
| 49 |
diff --git a/dev-lang/mono/mono-6.12.0.122.ebuild b/dev-lang/mono/mono-6.12.0.122.ebuild |
| 50 |
index 449d4aebe3b2..97ee904ee535 100644 |
| 51 |
--- a/dev-lang/mono/mono-6.12.0.122.ebuild |
| 52 |
+++ b/dev-lang/mono/mono-6.12.0.122.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2021 Gentoo Authors |
| 55 |
+# Copyright 1999-2022 Gentoo Authors |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=7 |
| 59 |
@@ -36,6 +36,7 @@ BDEPEND=" |
| 60 |
|
| 61 |
PATCHES=( |
| 62 |
"${FILESDIR}"/${PN}-5.12-try-catch.patch |
| 63 |
+ "${FILESDIR}"/${PN}-6.12.0.122-disable-automagic-ccache.patch |
| 64 |
) |
| 65 |
|
| 66 |
pkg_pretend() { |
Archives