summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/mono6/Makefile13
-rw-r--r--lang/mono6/PLIST34
-rw-r--r--lang/mono6/distinfo22
-rw-r--r--lang/mono6/patches/patch-acceptance-tests_Makefile.in10
-rw-r--r--lang/mono6/patches/patch-libgc_pthread__stop__world.c24
-rw-r--r--lang/mono6/patches/patch-libgc_pthread__support.c24
-rw-r--r--lang/mono6/patches/patch-mono_eglib_giconv.c12
-rw-r--r--lang/mono6/patches/patch-mono_metadata_icall.c6
-rw-r--r--lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in10
-rw-r--r--lang/mono6/patches/patch-scripts_submodules_versions.mk8
10 files changed, 37 insertions, 126 deletions
diff --git a/lang/mono6/Makefile b/lang/mono6/Makefile
index 445d5eeabe5..23e0f7287a1 100644
--- a/lang/mono6/Makefile
+++ b/lang/mono6/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2020/08/31 18:09:51 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2020/09/30 19:50:14 ryoon Exp $
-DISTNAME= mono-6.8.0.105
-PKGREVISION= 6
+DISTNAME= mono-6.10.0.104
CATEGORIES= lang
MASTER_SITES= https://download.mono-project.com/sources/mono/
EXTRACT_SUFX= .tar.xz
@@ -117,15 +116,9 @@ SUBST_MESSAGE.fix-cfgdir= Fixing configuration files install dir
SUBST_FILES.fix-cfgdir= mcs/tools/mconfig/Makefile
SUBST_SED.fix-cfgdir= -e 's,$$(sysconfdir)/mono,${EGDIR},g'
-SUBST_CLASSES+= fix-python
-SUBST_STAGE.fix-python= pre-configure
-SUBST_MESSAGE.fix-python= Fixing python binary name
-SUBST_FILES.fix-python+= mono/mini/Makefile.am.in
-SUBST_FILES.fix-python+= mono/tests/Makefile.am
-SUBST_SED.fix-python= -e 's,python,${PYTHONBIN},'
-
# Uses [[ ... ]], not needed during the build.
CHECK_PORTABILITY_SKIP+= acceptance-tests/microbench-perf.sh.in
+CHECK_PORTABILITY_SKIP+= external/llvm-project/polly/lib/External/isl/configure
.include "../../mk/bsd.prefs.mk"
diff --git a/lang/mono6/PLIST b/lang/mono6/PLIST
index 0d9371eef41..3c6bbdfea8a 100644
--- a/lang/mono6/PLIST
+++ b/lang/mono6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/06/28 17:20:43 nia Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/09/30 19:50:14 ryoon Exp $
bin/al
bin/al2
bin/aprofutil
@@ -3393,38 +3393,6 @@ share/examples/mono/4.5/web.config
share/examples/mono/browscap.ini
share/examples/mono/config
share/examples/mono/mconfig/config.xml
-${PLIST.boehm}share/libgc-mono/README
-${PLIST.boehm}share/libgc-mono/README.DGUX386
-${PLIST.boehm}share/libgc-mono/README.Mac
-${PLIST.boehm}share/libgc-mono/README.MacOSX
-${PLIST.boehm}share/libgc-mono/README.OS2
-${PLIST.boehm}share/libgc-mono/README.amiga
-${PLIST.boehm}share/libgc-mono/README.arm.cross
-${PLIST.boehm}share/libgc-mono/README.autoconf
-${PLIST.boehm}share/libgc-mono/README.changes
-${PLIST.boehm}share/libgc-mono/README.contributors
-${PLIST.boehm}share/libgc-mono/README.cords
-${PLIST.boehm}share/libgc-mono/README.darwin
-${PLIST.boehm}share/libgc-mono/README.dj
-${PLIST.boehm}share/libgc-mono/README.environment
-${PLIST.boehm}share/libgc-mono/README.ews4800
-${PLIST.boehm}share/libgc-mono/README.hp
-${PLIST.boehm}share/libgc-mono/README.linux
-${PLIST.boehm}share/libgc-mono/README.macros
-${PLIST.boehm}share/libgc-mono/README.rs6000
-${PLIST.boehm}share/libgc-mono/README.sgi
-${PLIST.boehm}share/libgc-mono/README.solaris2
-${PLIST.boehm}share/libgc-mono/README.uts
-${PLIST.boehm}share/libgc-mono/README.win32
-${PLIST.boehm}share/libgc-mono/barrett_diagram
-${PLIST.boehm}share/libgc-mono/debugging.html
-${PLIST.boehm}share/libgc-mono/gc.man
-${PLIST.boehm}share/libgc-mono/gcdescr.html
-${PLIST.boehm}share/libgc-mono/gcinterface.html
-${PLIST.boehm}share/libgc-mono/leak.html
-${PLIST.boehm}share/libgc-mono/scale.html
-${PLIST.boehm}share/libgc-mono/simple_example.html
-${PLIST.boehm}share/libgc-mono/tree.html
share/locale/de/LC_MESSAGES/mcs.mo
share/locale/es/LC_MESSAGES/mcs.mo
share/locale/ja/LC_MESSAGES/mcs.mo
diff --git a/lang/mono6/distinfo b/lang/mono6/distinfo
index 56158fdc6bf..ee4c5400743 100644
--- a/lang/mono6/distinfo
+++ b/lang/mono6/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2020/05/23 20:30:20 rillig Exp $
+$NetBSD: distinfo,v 1.11 2020/09/30 19:50:14 ryoon Exp $
-SHA1 (mono-6.8.0.105.tar.xz) = e39aa0ac15b3b73ecf0767462798a5acde0aed79
-RMD160 (mono-6.8.0.105.tar.xz) = 5a84c75f941d5a2a645999e13da8458fc87d3bac
-SHA512 (mono-6.8.0.105.tar.xz) = 8207082f6c538037a17dba5e22576d8e9b0aac946df270ff34daad0857e7b1cfd71c8cf4851e74dd5338397c9587540f11b23e71776bca6dc2a1b89dbed2fd7e
-Size (mono-6.8.0.105.tar.xz) = 243441900 bytes
-SHA1 (patch-acceptance-tests_Makefile.in) = 66866b180ccce299a0d492add5330351611ec5f2
+SHA1 (mono-6.10.0.104.tar.xz) = 9bc9297fe857dcaa8f8e0b8a535805d804217117
+RMD160 (mono-6.10.0.104.tar.xz) = 8285b273ddcc00840bba17df4da11b8b668ed804
+SHA512 (mono-6.10.0.104.tar.xz) = 73b853e9fc9af2e1bf5e45f7accb8893dd7e48f9723f74b03d99ea11cf565e2c5bb2d6ae4c81c7e7be0cdfa489016da909ed7b12808c8f84d9d25e33e1cb9874
+Size (mono-6.10.0.104.tar.xz) = 292616252 bytes
+SHA1 (patch-acceptance-tests_Makefile.in) = b2edf3ed54d3669c5651c6d63bb8fb04fae0fec0
SHA1 (patch-acceptance-tests_microbench-perf_sh_in) = d46118c1685e3e48a5b8594bf7f77acd2bebaf94
SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246
SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9
@@ -14,20 +14,18 @@ SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c6
SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01
SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4
SHA1 (patch-external_corert_src_Native_gc_env_gcenv.structs.h) = 91b37d93c1c3aadcdb383c443142fe28f50ad8e6
-SHA1 (patch-libgc_pthread__stop__world.c) = f5a12dc3f453136dabc0b93d57caa155a420ab0d
-SHA1 (patch-libgc_pthread__support.c) = b4fcf5ab1f5d5d06739891c1614ff870b8e4a4c5
-SHA1 (patch-mono_eglib_giconv.c) = 04d2559d3868605194efd6267da010870f53d961
-SHA1 (patch-mono_metadata_icall.c) = b326c16e9aa8f9ee154d937128e5e09fd31b235a
+SHA1 (patch-mono_eglib_giconv.c) = 5c2ca5788b93d371d1aa30f296a447516b622a4e
+SHA1 (patch-mono_metadata_icall.c) = 9c0ec3d4d3263943a7351a76065ef80ce312396a
SHA1 (patch-mono_metadata_w32mutex-unix.c) = c3d424fe4ae1079c9c664c876a087fb0134f2e22
SHA1 (patch-mono_mini_Makefile.am.in) = 7f4555b53e74646d96c847862999e4eceaa86164
SHA1 (patch-mono_mini_Makefile.in) = c8a96e8d9139b5f1c751abc2256af45c219e504e
SHA1 (patch-mono_tests_Makefile.am) = ddeab885c28be53dc457261c63af53b3de754052
SHA1 (patch-mono_tests_Makefile.in) = cf6a670e94b52f41d30ae6262f2f4ed5c0da4c05
-SHA1 (patch-mono_utils_jemalloc_Makefile.in) = 37a31f4c1fc40330a95c1c421dfc88359fbb4ef1
+SHA1 (patch-mono_utils_jemalloc_Makefile.in) = bb20a6f72c88632bf2e75c83174b4255788ad4ff
SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca
SHA1 (patch-mono_utils_mono-sigcontext.h) = b8a6f886661622e9b0d382443536bd3dc998f95f
SHA1 (patch-mono_utils_mono-threads-posix.c) = 3111d6a47fa104d964b34fdb5f7eca8643559ea3
SHA1 (patch-mono_utils_mono-utils-debug.c) = 39f099969040b3a52101b611be723b25674ea68b
SHA1 (patch-runtime_mono-wrapper.in) = ea40d2f2e8b67de0ae42c6e608e3c085dc2b040e
-SHA1 (patch-scripts_submodules_versions.mk) = 65f7ee0b8503f10d20f07127e6ca7021b44077de
+SHA1 (patch-scripts_submodules_versions.mk) = ca45d582a09af1bb3a1031a689c188605dea91b8
SHA1 (patch-support_minizip_ioapi.c) = 605c86916c957c31a8b3048d7703482f8f545463
diff --git a/lang/mono6/patches/patch-acceptance-tests_Makefile.in b/lang/mono6/patches/patch-acceptance-tests_Makefile.in
index 92a6523a26c..185aed1e260 100644
--- a/lang/mono6/patches/patch-acceptance-tests_Makefile.in
+++ b/lang/mono6/patches/patch-acceptance-tests_Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-acceptance-tests_Makefile.in,v 1.1 2020/03/29 01:07:01 joerg Exp $
+$NetBSD: patch-acceptance-tests_Makefile.in,v 1.2 2020/09/30 19:50:14 ryoon Exp $
---- acceptance-tests/Makefile.in.orig 2020-03-27 23:40:55.976678079 +0000
+--- acceptance-tests/Makefile.in.orig 2020-04-30 07:53:12.000000000 +0000
+++ acceptance-tests/Makefile.in
-@@ -5846,7 +5846,7 @@ __bump-version-%:
+@@ -5853,7 +5853,7 @@ __bump-version-%:
__bump-branch-%:
@if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
- @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
+ @if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
- python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
- python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
+ $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
+ $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
@if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
diff --git a/lang/mono6/patches/patch-libgc_pthread__stop__world.c b/lang/mono6/patches/patch-libgc_pthread__stop__world.c
deleted file mode 100644
index 254b886484e..00000000000
--- a/lang/mono6/patches/patch-libgc_pthread__stop__world.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-libgc_pthread__stop__world.c,v 1.1 2020/02/12 15:25:16 ryoon Exp $
-
-* Workaround for NetBSD's pthread_equal
-
---- libgc/pthread_stop_world.c.orig 2020-02-04 17:00:30.000000000 +0000
-+++ libgc/pthread_stop_world.c
-@@ -259,7 +259,7 @@ static void pthread_push_all_stacks()
- for (i = 0; i < THREAD_TABLE_SZ; i++) {
- for (p = GC_threads[i]; p != 0; p = p -> next) {
- if (p -> flags & FINISHED) continue;
-- if (pthread_equal(p -> id, me)) {
-+ if ((p -> id == me)) {
- # ifdef SPARC
- lo = (ptr_t)GC_save_regs_in_stack();
- # else
-@@ -305,7 +305,7 @@ static void pthread_push_all_stacks()
- (unsigned long) p -> id,
- (unsigned long) bs_lo, (unsigned long) bs_hi);
- # endif
-- if (pthread_equal(p -> id, me)) {
-+ if ((p -> id == me)) {
- GC_push_all_eager(bs_lo, bs_hi);
- } else {
- GC_push_all_stack(bs_lo, bs_hi);
diff --git a/lang/mono6/patches/patch-libgc_pthread__support.c b/lang/mono6/patches/patch-libgc_pthread__support.c
deleted file mode 100644
index 419ffce0da9..00000000000
--- a/lang/mono6/patches/patch-libgc_pthread__support.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-libgc_pthread__support.c,v 1.1 2020/02/12 15:25:16 ryoon Exp $
-
-* Workaround for NetBSD's pthread_equal
-
---- libgc/pthread_support.c.orig 2020-02-04 17:00:30.000000000 +0000
-+++ libgc/pthread_support.c
-@@ -791,7 +791,7 @@ void GC_delete_thread(pthread_t id)
- nacl_gc_thread_self = NULL;
- #endif
-
-- while (!pthread_equal(p -> id, id)) {
-+ while (!(p -> id == id)) {
- prev = p;
- p = p -> next;
- }
-@@ -846,7 +846,7 @@ GC_thread GC_lookup_thread(pthread_t id)
- int hv = ((unsigned long)id) % THREAD_TABLE_SZ;
- register GC_thread p = GC_threads[hv];
-
-- while (p != 0 && !pthread_equal(p -> id, id)) p = p -> next;
-+ while (p != 0 && !(p -> id == id)) p = p -> next;
- return(p);
- }
-
diff --git a/lang/mono6/patches/patch-mono_eglib_giconv.c b/lang/mono6/patches/patch-mono_eglib_giconv.c
index 88033f3a6ab..3f10c36d7a5 100644
--- a/lang/mono6/patches/patch-mono_eglib_giconv.c
+++ b/lang/mono6/patches/patch-mono_eglib_giconv.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-mono_eglib_giconv.c,v 1.1 2020/02/12 13:43:31 kamil Exp $
+$NetBSD: patch-mono_eglib_giconv.c,v 1.2 2020/09/30 19:50:14 ryoon Exp $
Support POSIX iconv(3) on modern NetBSD.
---- mono/eglib/giconv.c.orig 2019-12-10 07:50:32.000000000 +0000
+--- mono/eglib/giconv.c.orig 2020-04-30 07:46:10.000000000 +0000
+++ mono/eglib/giconv.c
@@ -37,6 +37,14 @@
#define FORCE_INLINE(RET_TYPE) inline RET_TYPE __attribute__((always_inline))
@@ -19,12 +19,12 @@ Support POSIX iconv(3) on modern NetBSD.
#define UNROLL_DECODE_UTF8 0
#define UNROLL_ENCODE_UTF8 0
-@@ -196,7 +204,7 @@ g_iconv (GIConv cd, gchar **inbytes, gsi
- } else {
+@@ -197,7 +205,7 @@ g_iconv (GIConv cd, gchar **inbytes, gsi
outleftptr = NULL;
}
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) && !NETBSD_POSIX_ICONV
+ // AIX needs this for C++ and GNU iconv
+-#if defined(__NetBSD__) || defined(_AIX)
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(_AIX)
return iconv (cd->cd, (const gchar **)inbytes, inleftptr, outbytes, outleftptr);
#else
return iconv (cd->cd, inbytes, inleftptr, outbytes, outleftptr);
diff --git a/lang/mono6/patches/patch-mono_metadata_icall.c b/lang/mono6/patches/patch-mono_metadata_icall.c
index b609d1cf562..87ffc75767c 100644
--- a/lang/mono6/patches/patch-mono_metadata_icall.c
+++ b/lang/mono6/patches/patch-mono_metadata_icall.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-mono_metadata_icall.c,v 1.2 2019/10/09 22:46:04 maya Exp $
+$NetBSD: patch-mono_metadata_icall.c,v 1.3 2020/09/30 19:50:14 ryoon Exp $
NetBSD will side-load <stdbool.h> which must have #define bool _Bool.
This causes some problems with the C preprocessor usage here. undef it.
---- mono/metadata/icall.c.orig 2019-09-19 07:46:07.000000000 +0000
+--- mono/metadata/icall.c.orig 2020-04-30 07:46:10.000000000 +0000
+++ mono/metadata/icall.c
@@ -120,6 +120,8 @@
- #include "mono/utils/mono-threads-coop.h"
#include "mono/metadata/icall-signatures.h"
+ #include "mono/utils/mono-signal-handler.h"
+#undef bool
+
diff --git a/lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in b/lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in
index 7598c22f635..140156ef4fc 100644
--- a/lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in
+++ b/lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-mono_utils_jemalloc_Makefile.in,v 1.1 2020/03/29 01:07:01 joerg Exp $
+$NetBSD: patch-mono_utils_jemalloc_Makefile.in,v 1.2 2020/09/30 19:50:14 ryoon Exp $
---- mono/utils/jemalloc/Makefile.in.orig 2020-03-27 23:41:16.834591125 +0000
+--- mono/utils/jemalloc/Makefile.in.orig 2020-04-30 07:53:15.000000000 +0000
+++ mono/utils/jemalloc/Makefile.in
-@@ -736,7 +736,7 @@ __bump-version-%:
+@@ -743,7 +743,7 @@ __bump-version-%:
__bump-branch-%:
@if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
- @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
+ @if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
- python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
- python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
+ $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
+ $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
@if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
diff --git a/lang/mono6/patches/patch-scripts_submodules_versions.mk b/lang/mono6/patches/patch-scripts_submodules_versions.mk
index 4c020f7afc6..bb6ef768add 100644
--- a/lang/mono6/patches/patch-scripts_submodules_versions.mk
+++ b/lang/mono6/patches/patch-scripts_submodules_versions.mk
@@ -1,6 +1,6 @@
-$NetBSD: patch-scripts_submodules_versions.mk,v 1.1 2020/03/29 01:07:01 joerg Exp $
+$NetBSD: patch-scripts_submodules_versions.mk,v 1.2 2020/09/30 19:50:14 ryoon Exp $
---- scripts/submodules/versions.mk.orig 2020-03-27 23:43:04.070978830 +0000
+--- scripts/submodules/versions.mk.orig 2020-04-30 07:46:10.000000000 +0000
+++ scripts/submodules/versions.mk
@@ -111,7 +111,7 @@ __bump-version-%:
@@ -8,6 +8,6 @@ $NetBSD: patch-scripts_submodules_versions.mk,v 1.1 2020/03/29 01:07:01 joerg Ex
@if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
- @if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
+ @if [ "$(REMOTE_BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
- python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
- python $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
+ $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-branch $* $(BRANCH)
+ $(PYTHON) $(SCRIPT) $(SUBMODULES_CONFIG_FILE) set-remote-branch $* $(REMOTE_BRANCH)
@if [ "$(COMMIT)" = "1" ]; then echo "[submodules] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(SUBMODULES_CONFIG_FILE); fi
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 02:20:03 +0000