mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-31 06:46:50 +01:00
ff9771114d
* 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
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
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
|