diff options
Diffstat (limited to 'lang/mono/patches')
-rw-r--r-- | lang/mono/patches/patch-aa | 18 | ||||
-rw-r--r-- | lang/mono/patches/patch-ac | 8 | ||||
-rw-r--r-- | lang/mono/patches/patch-ad | 8 | ||||
-rw-r--r-- | lang/mono/patches/patch-ah | 63 | ||||
-rw-r--r-- | lang/mono/patches/patch-aj | 26 | ||||
-rw-r--r-- | lang/mono/patches/patch-ak | 10 | ||||
-rw-r--r-- | lang/mono/patches/patch-ba | 13 | ||||
-rw-r--r-- | lang/mono/patches/patch-bb | 13 | ||||
-rw-r--r-- | lang/mono/patches/patch-bc | 23 |
9 files changed, 70 insertions, 112 deletions
diff --git a/lang/mono/patches/patch-aa b/lang/mono/patches/patch-aa index f807967fa14..150d2647eb9 100644 --- a/lang/mono/patches/patch-aa +++ b/lang/mono/patches/patch-aa @@ -1,14 +1,12 @@ -$NetBSD: patch-aa,v 1.5 2004/05/11 17:33:42 recht Exp $ +$NetBSD: patch-aa,v 1.6 2004/06/26 20:19:16 recht Exp $ ---- configure.orig 2004-05-11 14:34:57.000000000 +0200 -+++ configure 2004-05-11 14:35:25.000000000 +0200 -@@ -14078,6 +14078,9 @@ - libsuffix=".dylib" - LIBC="libc.dylib" +--- configure.orig 2004-06-26 20:09:52.000000000 +0200 ++++ configure 2004-06-26 20:10:16.000000000 +0200 +@@ -14124,6 +14124,7 @@ + ;; + *-*-*netbsd*) + LIBC="libc.so.12" ++ INTL="libintl.so.0" ;; -+ *-*-*netbsd*) -+ LIBC="libc.so.12" -+ ;; esac - diff --git a/lang/mono/patches/patch-ac b/lang/mono/patches/patch-ac index 3a55cf55cb2..61b03011901 100644 --- a/lang/mono/patches/patch-ac +++ b/lang/mono/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2004/05/11 17:33:42 recht Exp $ +$NetBSD: patch-ac,v 1.8 2004/06/26 20:19:16 recht Exp $ ---- data/Makefile.in.orig 2004-05-04 23:51:17.000000000 +0200 -+++ data/Makefile.in 2004-05-11 14:04:36.000000000 +0200 -@@ -120,7 +120,7 @@ +--- data/Makefile.in.orig 2004-06-25 01:27:58.000000000 +0200 ++++ data/Makefile.in 2004-06-26 14:01:31.000000000 +0200 +@@ -121,7 +121,7 @@ libmono_cflags = @libmono_cflags@ libmono_ldflags = @libmono_ldflags@ libsuffix = @libsuffix@ diff --git a/lang/mono/patches/patch-ad b/lang/mono/patches/patch-ad index d948f10364e..18b889d16f1 100644 --- a/lang/mono/patches/patch-ad +++ b/lang/mono/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.7 2004/05/11 17:33:42 recht Exp $ +$NetBSD: patch-ad,v 1.8 2004/06/26 20:19:16 recht Exp $ ---- mono/metadata/icall.c.orig 2004-05-11 13:57:50.000000000 +0200 -+++ mono/metadata/icall.c 2004-05-11 14:03:41.000000000 +0200 -@@ -4597,7 +4597,7 @@ +--- mono/metadata/icall.c.orig 2004-06-25 00:44:48.000000000 +0200 ++++ mono/metadata/icall.c 2004-06-26 14:01:58.000000000 +0200 +@@ -4743,7 +4743,7 @@ MONO_ARCH_SAVE_REGS; diff --git a/lang/mono/patches/patch-ah b/lang/mono/patches/patch-ah deleted file mode 100644 index 89ff9c4a7bc..00000000000 --- a/lang/mono/patches/patch-ah +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2003/12/03 17:08:24 recht Exp $ - ---- libgc/os_dep.c.orig 2003-08-26 23:21:14.000000000 +0200 -+++ libgc/os_dep.c 2003-11-27 18:34:40.000000000 +0100 -@@ -121,7 +121,7 @@ - # include <fcntl.h> - #endif - --#if defined(SUNOS5SIGS) || defined (HURD) || defined(LINUX) -+#if defined(SUNOS5SIGS) || defined (HURD) || defined(LINUX) || defined(NETBSD) - # ifdef SUNOS5SIGS - # include <sys/siginfo.h> - # endif -@@ -688,9 +688,11 @@ - typedef void (*handler)(); - # endif - --# if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) || defined(HURD) -+# if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1) \ -+ || defined(HURD) || defined(NETBSD) - static struct sigaction old_segv_act; --# if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) || defined(HURD) -+# if defined(_sigargs) /* !Irix6.x */ || defined(HPUX) \ -+ || defined(HURD) || defined(NETBSD) - static struct sigaction old_bus_act; - # endif - # else -@@ -705,11 +707,11 @@ - # endif - { - # if defined(SUNOS5SIGS) || defined(IRIX5) \ -- || defined(OSF1) || defined(HURD) -+ || defined(OSF1) || defined(HURD) || defined(NETBSD) - struct sigaction act; - - act.sa_handler = h; --# ifdef SUNOS5SIGS -+# if defined(SUNOS5SIGS) || defined(NETBSD) - act.sa_flags = SA_RESTART | SA_NODEFER; - # else - act.sa_flags = SA_RESTART; -@@ -729,7 +731,7 @@ - # else - (void) sigaction(SIGSEGV, &act, &old_segv_act); - # if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \ -- || defined(HPUX) || defined(HURD) -+ || defined(HPUX) || defined(HURD) || defined(NETBSD) - /* Under Irix 5.x or HP/UX, we may get SIGBUS. */ - /* Pthreads doesn't exist under Irix 5.x, so we */ - /* don't have to worry in the threads case. */ -@@ -765,10 +767,10 @@ - void GC_reset_fault_handler() - { - # if defined(SUNOS5SIGS) || defined(IRIX5) \ -- || defined(OSF1) || defined(HURD) -+ || defined(OSF1) || defined(HURD) || defined(NETBSD) - (void) sigaction(SIGSEGV, &old_segv_act, 0); - # if defined(IRIX5) && defined(_sigargs) /* Irix 5.x, not 6.x */ \ -- || defined(HPUX) || defined(HURD) -+ || defined(HPUX) || defined(HURD) || defined(NETBSD) - (void) sigaction(SIGBUS, &old_bus_act, 0); - # endif - # else diff --git a/lang/mono/patches/patch-aj b/lang/mono/patches/patch-aj deleted file mode 100644 index 534b18139e0..00000000000 --- a/lang/mono/patches/patch-aj +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2003/12/03 17:08:24 recht Exp $ - ---- libgc/include/private/gcconfig.h.orig 2003-08-26 23:01:26.000000000 +0200 -+++ libgc/include/private/gcconfig.h 2003-11-27 18:42:00.000000000 +0100 -@@ -1151,8 +1151,8 @@ - # ifndef GC_FREEBSD_THREADS - # define MPROTECT_VDB - # endif --# define SIG_SUSPEND SIGUSR1 --# define SIG_THR_RESTART SIGUSR2 -+# define SIG_SUSPEND SIGTSTP -+# define SIG_THR_RESTART SIGCONT - # define FREEBSD_STACKBOTTOM - # ifdef __ELF__ - # define DYNAMIC_LOADING -@@ -1466,8 +1466,8 @@ - # ifdef FREEBSD - # define OS_TYPE "FREEBSD" - /* MPROTECT_VDB is not yet supported at all on FreeBSD/alpha. */ --# define SIG_SUSPEND SIGUSR1 --# define SIG_THR_RESTART SIGUSR2 -+# define SIG_SUSPEND SIGTSTP -+# define SIG_THR_RESTART SIGCONT - # define FREEBSD_STACKBOTTOM - # ifdef __ELF__ - # define DYNAMIC_LOADING diff --git a/lang/mono/patches/patch-ak b/lang/mono/patches/patch-ak index 434513b63db..4ff351afb85 100644 --- a/lang/mono/patches/patch-ak +++ b/lang/mono/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.3 2004/05/11 17:33:42 recht Exp $ +$NetBSD: patch-ak,v 1.4 2004/06/26 20:19:16 recht Exp $ ---- mono/metadata/mono-config.c.orig 2004-05-11 14:06:35.000000000 +0200 -+++ mono/metadata/mono-config.c 2004-05-11 14:06:59.000000000 +0200 -@@ -308,7 +308,7 @@ +--- mono/metadata/mono-config.c.orig 2004-06-19 20:03:54.000000000 +0200 ++++ mono/metadata/mono-config.c 2004-06-26 14:02:25.000000000 +0200 +@@ -285,7 +285,7 @@ home = g_get_home_dir (); for (i = 0; (aname = get_assembly_filename (assembly, i)) != NULL; ++i) { @@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.3 2004/05/11 17:33:42 recht Exp $ got_it += mono_config_parse_file_with_context (&state, cfg); g_free (cfg); -@@ -345,7 +345,7 @@ +@@ -322,7 +322,7 @@ return; } diff --git a/lang/mono/patches/patch-ba b/lang/mono/patches/patch-ba new file mode 100644 index 00000000000..bab88b29358 --- /dev/null +++ b/lang/mono/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.1 2004/06/26 20:19:16 recht Exp $ + +--- mono/cil/Makefile.in.orig 2004-06-26 14:04:26.000000000 +0200 ++++ mono/cil/Makefile.in 2004-06-26 14:04:33.000000000 +0200 +@@ -299,7 +299,7 @@ + + + opcode.def: make-opcodes-def.pl cil-opcodes.xml +- perl make-opcodes-def.pl < $(srcdir)/cil-opcodes.xml > opcode.def ++# $(PERL) make-opcodes-def.pl < $(srcdir)/cil-opcodes.xml > opcode.def + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/lang/mono/patches/patch-bb b/lang/mono/patches/patch-bb new file mode 100644 index 00000000000..563ab08dfe0 --- /dev/null +++ b/lang/mono/patches/patch-bb @@ -0,0 +1,13 @@ +$NetBSD: patch-bb,v 1.1 2004/06/26 20:19:16 recht Exp $ + +--- mono/metadata/Makefile.in.orig 2004-06-26 14:05:44.000000000 +0200 ++++ mono/metadata/Makefile.in 2004-06-26 14:05:51.000000000 +0200 +@@ -682,7 +682,7 @@ + @WITH_BUNDLE_TRUE@ @if test -f $@; then :; else rm -f mono-bundle.stamp; $(MAKE) mono-bundle.stamp; fi + @WITH_BUNDLE_TRUE@mono-bundle.stamp: $(BUNDLE_FILE) $(srcdir)/make-bundle.pl + @WITH_BUNDLE_TRUE@ echo stamp > $@t +-@WITH_BUNDLE_TRUE@ perl $(srcdir)/make-bundle.pl $(BUNDLE_FILE) mono-bundle.h mono-bundle.s ++@WITH_BUNDLE_TRUE@ $(PERL) $(srcdir)/make-bundle.pl $(BUNDLE_FILE) mono-bundle.h mono-bundle.s + @WITH_BUNDLE_TRUE@ mv $@t $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lang/mono/patches/patch-bc b/lang/mono/patches/patch-bc new file mode 100644 index 00000000000..06d5cc71e4e --- /dev/null +++ b/lang/mono/patches/patch-bc @@ -0,0 +1,23 @@ +$NetBSD: patch-bc,v 1.1 2004/06/26 20:19:16 recht Exp $ + +--- mono/mini/Makefile.in.orig 2004-06-26 14:06:19.000000000 +0200 ++++ mono/mini/Makefile.in 2004-06-26 14:06:35.000000000 +0200 +@@ -798,15 +798,15 @@ + + stat1: mono bench.exe + ./mono --verbose --statfile stats.pl --regression bench.exe +- perl viewstat.pl stats.pl ++ $(PERL) viewstat.pl stats.pl + + stat2: mono basic.exe + ./mono --verbose --statfile stats.pl --regression basic.exe +- perl viewstat.pl -e stats.pl ++ $(PERL) viewstat.pl -e stats.pl + + stat3: mono bench.exe + ./mono --statfile stats.pl --ncompile 1000 --compile Tests:test_0_many_nested_loops bench.exe +- perl viewstat.pl stats.pl ++ $(PERL) viewstat.pl stats.pl + + docu: mini.sgm + docbook2txt mini.sgm |