Received: by mail.netbsd.org (Postfix, from userid 605) id 7451B84EB8; Fri, 27 Jul 2018 20:02:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6B08184C85 for ; Fri, 27 Jul 2018 20:02:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id JiajzVjVfamy for ; Fri, 27 Jul 2018 20:02:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0C81E84DB9 for ; Fri, 27 Jul 2018 20:02:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 061BDFBEC; Fri, 27 Jul 2018 20:02:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_153272176154000" MIME-Version: 1.0 Date: Fri, 27 Jul 2018 20:02:41 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/mono To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180727200241.061BDFBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_153272176154000 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Fri Jul 27 20:02:40 UTC 2018 Modified Files: pkgsrc/lang/mono: Makefile PLIST.common distinfo pkgsrc/lang/mono/patches: patch-configure Added Files: pkgsrc/lang/mono/patches: patch-mono_metadata_boehm-gc.c Log Message: mono: Switch to pkgsrc boehm-gc on SunOS. The bundled one has issues with newer GCCs, and the pkgsrc one is newer and optimised, so switching is simpler than trying to retro-fit an old version. Fix --with-gc, this appears to have always been broken, and our --with-gc=none argument actually ended up as --with-gc=included, so make that now explicit. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.178 -r1.179 pkgsrc/lang/mono/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/mono/PLIST.common cvs rdiff -u -r1.109 -r1.110 pkgsrc/lang/mono/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/mono/patches/patch-configure cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/mono/patches/patch-mono_metadata_boehm-gc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_153272176154000 Content-Disposition: inline Content-Length: 9002 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/mono/Makefile diff -u pkgsrc/lang/mono/Makefile:1.178 pkgsrc/lang/mono/Makefile:1.179 --- pkgsrc/lang/mono/Makefile:1.178 Fri Jul 20 03:33:51 2018 +++ pkgsrc/lang/mono/Makefile Fri Jul 27 20:02:40 2018 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.178 2018/07/20 03:33:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.179 2018/07/27 20:02:40 jperkin Exp $ DISTNAME= mono-4.0.4.1 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= lang MASTER_SITES= http://download.mono-project.com/sources/mono/ EXTRACT_SUFX= .tar.bz2 @@ -24,7 +24,7 @@ EXTRACT_USING= gtar GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} --with-icu=yes CONFIGURE_ARGS+= --with-preview=yes --with-libgdiplus=installed -CONFIGURE_ARGS+= --disable-dtrace --with-gc=none +CONFIGURE_ARGS+= --disable-dtrace .include "options.mk" @@ -134,7 +134,7 @@ SUBST_MESSAGE.fix-libx11= Fixing libX11 SUBST_FILES.fix-libx11= configure SUBST_SED.fix-libx11= -e 's,@X11BASE@,${X11BASE},g' -PLIST_VARS= monodoc +PLIST_VARS= libgc monodoc .include "../../mk/bsd.prefs.mk" @@ -147,6 +147,16 @@ SUBST_SED.fix-domlib= -e 's,@DOMAINLIB@ SUBST_SED.fix-domlib= -e 's,@DOMAINLIB@,libc,g' .endif +# The builtin boehm-gc fails on SunOS with newer GCC, just use the pkgsrc +# version in any case as it is optimised. +.if ${OPSYS} == "SunOS" +.include "../../devel/boehm-gc/buildlink3.mk" +CONFIGURE_ARGS+= --with-gc=boehm +.else +CONFIGURE_ARGS+= --with-gc=included +PLIST.libgc= yes +.endif + .if ${OPSYS} == "SunOS" CFLAGS+= -D_XOPEN_SOURCE=600 CONFIGURE_ARGS+= --with-mcs-docs=no Index: pkgsrc/lang/mono/PLIST.common diff -u pkgsrc/lang/mono/PLIST.common:1.26 pkgsrc/lang/mono/PLIST.common:1.27 --- pkgsrc/lang/mono/PLIST.common:1.26 Tue Aug 25 12:22:59 2015 +++ pkgsrc/lang/mono/PLIST.common Fri Jul 27 20:02:40 2018 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.26 2015/08/25 12:22:59 wiz Exp $ +@comment $NetBSD: PLIST.common,v 1.27 2018/07/27 20:02:40 jperkin Exp $ bin/al bin/al2 bin/caspol @@ -1105,36 +1105,36 @@ share/examples/mono/4.5/web.config share/examples/mono/browscap.ini share/examples/mono/config share/examples/mono/mconfig/config.xml -share/libgc-mono/README -share/libgc-mono/README.DGUX386 -share/libgc-mono/README.Mac -share/libgc-mono/README.MacOSX -share/libgc-mono/README.OS2 -share/libgc-mono/README.amiga -share/libgc-mono/README.arm.cross -share/libgc-mono/README.autoconf -share/libgc-mono/README.changes -share/libgc-mono/README.contributors -share/libgc-mono/README.cords -share/libgc-mono/README.darwin -share/libgc-mono/README.dj -share/libgc-mono/README.environment -share/libgc-mono/README.ews4800 -share/libgc-mono/README.hp -share/libgc-mono/README.linux -share/libgc-mono/README.macros -share/libgc-mono/README.rs6000 -share/libgc-mono/README.sgi -share/libgc-mono/README.solaris2 -share/libgc-mono/README.uts -share/libgc-mono/README.win32 -share/libgc-mono/barrett_diagram -share/libgc-mono/debugging.html -share/libgc-mono/gc.man -share/libgc-mono/gcdescr.html -share/libgc-mono/gcinterface.html -share/libgc-mono/leak.html -share/libgc-mono/scale.html -share/libgc-mono/simple_example.html -share/libgc-mono/tree.html +${PLIST.libgc}share/libgc-mono/README +${PLIST.libgc}share/libgc-mono/README.DGUX386 +${PLIST.libgc}share/libgc-mono/README.Mac +${PLIST.libgc}share/libgc-mono/README.MacOSX +${PLIST.libgc}share/libgc-mono/README.OS2 +${PLIST.libgc}share/libgc-mono/README.amiga +${PLIST.libgc}share/libgc-mono/README.arm.cross +${PLIST.libgc}share/libgc-mono/README.autoconf +${PLIST.libgc}share/libgc-mono/README.changes +${PLIST.libgc}share/libgc-mono/README.contributors +${PLIST.libgc}share/libgc-mono/README.cords +${PLIST.libgc}share/libgc-mono/README.darwin +${PLIST.libgc}share/libgc-mono/README.dj +${PLIST.libgc}share/libgc-mono/README.environment +${PLIST.libgc}share/libgc-mono/README.ews4800 +${PLIST.libgc}share/libgc-mono/README.hp +${PLIST.libgc}share/libgc-mono/README.linux +${PLIST.libgc}share/libgc-mono/README.macros +${PLIST.libgc}share/libgc-mono/README.rs6000 +${PLIST.libgc}share/libgc-mono/README.sgi +${PLIST.libgc}share/libgc-mono/README.solaris2 +${PLIST.libgc}share/libgc-mono/README.uts +${PLIST.libgc}share/libgc-mono/README.win32 +${PLIST.libgc}share/libgc-mono/barrett_diagram +${PLIST.libgc}share/libgc-mono/debugging.html +${PLIST.libgc}share/libgc-mono/gc.man +${PLIST.libgc}share/libgc-mono/gcdescr.html +${PLIST.libgc}share/libgc-mono/gcinterface.html +${PLIST.libgc}share/libgc-mono/leak.html +${PLIST.libgc}share/libgc-mono/scale.html +${PLIST.libgc}share/libgc-mono/simple_example.html +${PLIST.libgc}share/libgc-mono/tree.html share/mono-2.0/mono/cil/cil-opcodes.xml Index: pkgsrc/lang/mono/distinfo diff -u pkgsrc/lang/mono/distinfo:1.109 pkgsrc/lang/mono/distinfo:1.110 --- pkgsrc/lang/mono/distinfo:1.109 Tue Aug 22 13:43:34 2017 +++ pkgsrc/lang/mono/distinfo Fri Jul 27 20:02:40 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.109 2017/08/22 13:43:34 jperkin Exp $ +$NetBSD: distinfo,v 1.110 2018/07/27 20:02:40 jperkin Exp $ SHA1 (mono-4.0.4.1.tar.bz2) = 12f3dbdac92e937cafba1d4e5a168c4cf2620935 RMD160 (mono-4.0.4.1.tar.bz2) = 27c2d2682786444ee52199134cb84cc59894b093 @@ -23,7 +23,7 @@ SHA1 (patch-be) = d1b603478ff8b1acdd2160 SHA1 (patch-bf) = 550c198e41ccc33dd690950754af4557df9b1d1d SHA1 (patch-bi) = 4d2252c53facafeb8fc7f459759294da5f14dfeb SHA1 (patch-cc) = d26c9e04f04896f0e7b2edab61cd347d76e0fcaf -SHA1 (patch-configure) = 20af37b1f87623504d8e70dd6b749eeb3bf0118a +SHA1 (patch-configure) = 7b80c9e4a63ba3058c06d88c8db14dd1c76f6ca3 SHA1 (patch-da) = 08c7c78aa4c6f1a1de4d34aebe05cd2ed1e7dcfd SHA1 (patch-data_Makefile.in) = 0c54664b1a59714c6bec02547d70eaa7dee47928 SHA1 (patch-data_mono-nunit.pc.in) = 59e0a932727b842ac90c2d0b702481d62f72cab8 @@ -44,6 +44,7 @@ SHA1 (patch-libgc_misc.c) = 52c68e7b6f1b SHA1 (patch-man_mprof-report.1) = 0a80c164614cc9af5f01822005193d80f1d89946 SHA1 (patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs) = 2c312a28f24a45ca2802dcbe032fd7007ddd60a3 SHA1 (patch-mono_dis_Makefile.in) = f000112e2712faf29104489e45feae8d6fc45169 +SHA1 (patch-mono_metadata_boehm-gc.c) = 7398638ba62e09eefead5a87661226573eb5f220 SHA1 (patch-mono_metadata_icall.c) = 191a7fccb174855026cb11dd0f6ac450bb920ec7 SHA1 (patch-mono_metadata_mono-perfcounters.c) = 8cfbfa62fe4201a20bc07645ccf6b13487a64fc3 SHA1 (patch-mono_metadata_mono-route.c) = 6eb741efca0a66fae894f7c49fa8f6393079e67f Index: pkgsrc/lang/mono/patches/patch-configure diff -u pkgsrc/lang/mono/patches/patch-configure:1.3 pkgsrc/lang/mono/patches/patch-configure:1.4 --- pkgsrc/lang/mono/patches/patch-configure:1.3 Tue Aug 25 12:23:00 2015 +++ pkgsrc/lang/mono/patches/patch-configure Fri Jul 27 20:02:40 2018 @@ -1,6 +1,8 @@ -$NetBSD: patch-configure,v 1.3 2015/08/25 12:23:00 wiz Exp $ +$NetBSD: patch-configure,v 1.4 2018/07/27 20:02:40 jperkin Exp $ ---- configure.orig 2015-08-04 07:48:54.000000000 +0000 +Fix --with-gc variables. + +--- configure.orig 2015-08-25 22:09:27.000000000 +0000 +++ configure @@ -3983,7 +3983,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1 mono_cv_clang=no @@ -45,6 +47,17 @@ $NetBSD: patch-configure,v 1.3 2015/08/2 need_link_unlink=yes $as_echo "#define PTHREAD_POINTER_ID 1" >>confdefs.h +@@ -20115,8 +20119,8 @@ rm -f core conftest.err conftest.$ac_obj + + + # Check whether --with-libgc was given. +-if test "${with_libgc+set}" = set; then : +- withval=$with_libgc; libgc=$with_gc ++if test "${with_gc+set}" = set; then : ++ withval=$with_gc; libgc=$withval + else + libgc=$libgc_default + fi @@ -21999,9 +22003,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris XPG4 support" >&5 $as_echo_n "checking for Solaris XPG4 support... " >&6; } Added files: Index: pkgsrc/lang/mono/patches/patch-mono_metadata_boehm-gc.c diff -u /dev/null pkgsrc/lang/mono/patches/patch-mono_metadata_boehm-gc.c:1.1 --- /dev/null Fri Jul 27 20:02:40 2018 +++ pkgsrc/lang/mono/patches/patch-mono_metadata_boehm-gc.c Fri Jul 27 20:02:40 2018 @@ -0,0 +1,30 @@ +$NetBSD: patch-mono_metadata_boehm-gc.c,v 1.1 2018/07/27 20:02:40 jperkin Exp $ + +Support newer boehm-gc. + +--- mono/metadata/boehm-gc.c.orig 2015-08-25 22:09:13.000000000 +0000 ++++ mono/metadata/boehm-gc.c +@@ -1334,7 +1334,11 @@ mono_gc_toggleref_add (MonoObject *objec + void + mono_gc_toggleref_register_callback (MonoToggleRefStatus (*proccess_toggleref) (MonoObject *obj)) + { ++#if GC_VERSION_MAJOR >= 7 ++ GC_set_toggleref_func ((GC_ToggleRefStatus (*) (GC_PTR obj)) proccess_toggleref); ++#else + GC_toggleref_register_callback ((int (*) (GC_PTR obj)) proccess_toggleref); ++#endif + } + + /* Test support code */ +@@ -1383,7 +1387,11 @@ mono_gc_register_finalizer_callbacks (Mo + + fin_callbacks = *callbacks; + ++#if GC_VERSION_MAJOR >= 7 ++ GC_set_await_finalize_proc ((void (*) (GC_PTR))fin_notifier); ++#else + GC_set_finalizer_notify_proc ((void (*) (GC_PTR))fin_notifier); ++#endif + } + + #endif /* no Boehm GC */ --_----------=_153272176154000--