diff options
| author | unmush <unmush@hashbang.sh> | 2024-11-26 13:04:13 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2024-12-22 15:37:34 +0200 |
| commit | ff9771114de0856c803cf777f0fe6338cae9acc3 (patch) | |
| tree | 947d6bcd5eb90e7f106a52c42f30b2ecdc9b40bf /gnu/packages | |
| parent | 436648994eaed5092393da4d6bdab6f0958dc7f2 (diff) | |
| download | guix-ff9771114de0856c803cf777f0fe6338cae9acc3.tar.gz guix-ff9771114de0856c803cf777f0fe6338cae9acc3.zip | |
gnu: Add mono-2.6.4.
* gnu/dotnet.scm (mono-2.6.4): New variable.
* gnu/packages/patches/mono-2.6.4-fixes.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
Change-Id: Ie2238810ea067724978440857150cad269d3d377
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/dotnet.scm | 21 | ||||
| -rw-r--r-- | gnu/packages/patches/mono-2.6.4-fixes.patch | 49 |
2 files changed, 70 insertions, 0 deletions
diff --git a/gnu/packages/dotnet.scm b/gnu/packages/dotnet.scm index 286c8d674c..46a2634641 100644 --- a/gnu/packages/dotnet.scm +++ b/gnu/packages/dotnet.scm @@ -506,3 +506,24 @@ a C-style programming language from Microsoft that is very similar to Java.") license:lgpl2.0+ ;; note: ./mcs/LICENSE.LGPL specifies no version ;; mcs/jay license:bsd-4)))) + +(define-public mono-2.6.4 + (package + (inherit mono-2.4.2) + (version "2.6.4") + (name "mono") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.winehq.org/mono/mono.git") + (commit (string-append "mono-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17977w45qh8jmfsl4bhi83si4fxd8s3x8b0pxnwdzjv3bqr54c85")) + (modules '((guix build utils) + (ice-9 string-fun))) + (snippet prepare-mono-source) + (patches (search-patches "mono-2.6.4-fixes.patch")))) + (native-inputs (modify-inputs (package-native-inputs mono-2.4.2) + (replace "mono" mono-2.4.2))))) diff --git a/gnu/packages/patches/mono-2.6.4-fixes.patch b/gnu/packages/patches/mono-2.6.4-fixes.patch new file mode 100644 index 0000000000..e802c8bb7e --- /dev/null +++ b/gnu/packages/patches/mono-2.6.4-fixes.patch @@ -0,0 +1,49 @@ +diff --git a/data/mono.pc.in b/data/mono.pc.in +index 01e0a9e5d41..d43bb187218 100644 +--- a/data/mono.pc.in ++++ b/data/mono.pc.in +@@ -7,8 +7,6 @@ sysconfdir=@sysconfdir@ + Name: Mono + Description: Mono Runtime + Version: @VERSION@ +-## Commented out because SLE hides devel files in the SLE SDK, +-## which not all customers will have. +-#Requires: glib-2.0 gthread-2.0 ++Requires: glib-2.0 gthread-2.0 bdw-gc + Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@ + Cflags: -I${includedir} @libmono_cflags@ +diff --git a/mono-uninstalled.pc.in b/mono-uninstalled.pc.in +index 7fa3f12dc91..2a0734362fd 100644 +--- a/mono-uninstalled.pc.in ++++ b/mono-uninstalled.pc.in +@@ -1,6 +1,6 @@ + Name: Mono + Description: Mono Runtime + Version: @VERSION@ +-Requires: glib-2.0 gthread-2.0 ++Requires: glib-2.0 gthread-2.0 bdw-gc + Libs: -L@mono_build_root@/mono/mini/.libs @export_ldflags@ -lmono @libmono_ldflags@ + Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/mono @libmono_cflags@ +diff --git a/mono/mini/driver.c b/mono/mini/driver.c +index c4e7f4ccdb3..bb705c0d1fc 100644 +--- a/mono/mini/driver.c ++++ b/mono/mini/driver.c +@@ -1302,6 +1302,7 @@ mono_main (int argc, char* argv[]) + #endif + if (!g_thread_supported ()) + g_thread_init (NULL); ++ GC_allow_register_threads(); + + if (mono_running_on_valgrind () && getenv ("MONO_VALGRIND_LEAK_CHECK")) { + GMemVTable mem_vtable; +diff --git a/runtime/Makefile.am b/runtime/Makefile.am +index da0c0e8671d..9d0deaf182f 100644 +--- a/runtime/Makefile.am ++++ b/runtime/Makefile.am +@@ -1,6 +1,3 @@ +-# hack to prevent 'check' from depending on 'all' +-AUTOMAKE_OPTIONS = cygnus +- + tmpinst = _tmpinst + + noinst_SCRIPTS = mono-wrapper monodis-wrapper |