Sun Jun 28 17:20:43 2020 UTC ()
mono6: Disable boehm garbage collector on aarch64

The embedded copy of boehm-gc fails to build on aarch64 and sgen
is considered the "modern" mono garbage collector, so we can
easily build with just that.

For this to work, the arguments need to register with the configure
script properly, which wasn't happening because autogen was running
configure. Stop that from happening.

Bump PKGREVISION


(nia)
diff -r1.18 -r1.19 pkgsrc/lang/mono6/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/mono6/PLIST
cvs diff -r1.18 -r1.19 pkgsrc/lang/mono6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/mono6/Attic/Makefile 2020/06/02 08:22:45 1.18
+++ pkgsrc/lang/mono6/Attic/Makefile 2020/06/28 17:20:43 1.19
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.18 2020/06/02 08:22:45 adam Exp $ 1# $NetBSD: Makefile,v 1.19 2020/06/28 17:20:43 nia Exp $
2 2
3DISTNAME= mono-6.8.0.105 3DISTNAME= mono-6.8.0.105
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= https://download.mono-project.com/sources/mono/ 6MASTER_SITES= https://download.mono-project.com/sources/mono/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.mono-project.com/ 10HOMEPAGE= https://www.mono-project.com/
11COMMENT= Open source implementation of the .NET Development Framework 11COMMENT= Open source implementation of the .NET Development Framework
12LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0 12LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
13 13
14WRKSRC= ${WRKDIR}/${DISTNAME} 14WRKSRC= ${WRKDIR}/${DISTNAME}
15 15
16TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser 16TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
17CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]* 17CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
@@ -119,56 +119,61 @@ SUBST_SED.fix-cfgdir= -e 's,$$(sysconfd @@ -119,56 +119,61 @@ SUBST_SED.fix-cfgdir= -e 's,$$(sysconfd
119 119
120SUBST_CLASSES+= fix-python 120SUBST_CLASSES+= fix-python
121SUBST_STAGE.fix-python= pre-configure 121SUBST_STAGE.fix-python= pre-configure
122SUBST_MESSAGE.fix-python= Fixing python binary name 122SUBST_MESSAGE.fix-python= Fixing python binary name
123SUBST_FILES.fix-python+= mono/mini/Makefile.am.in 123SUBST_FILES.fix-python+= mono/mini/Makefile.am.in
124SUBST_FILES.fix-python+= mono/tests/Makefile.am 124SUBST_FILES.fix-python+= mono/tests/Makefile.am
125SUBST_SED.fix-python= -e 's,python,${PYTHONBIN},' 125SUBST_SED.fix-python= -e 's,python,${PYTHONBIN},'
126 126
127# Uses [[ ... ]], not needed during the build. 127# Uses [[ ... ]], not needed during the build.
128CHECK_PORTABILITY_SKIP+= acceptance-tests/microbench-perf.sh.in 128CHECK_PORTABILITY_SKIP+= acceptance-tests/microbench-perf.sh.in
129 129
130.include "../../mk/bsd.prefs.mk" 130.include "../../mk/bsd.prefs.mk"
131 131
132# XXX remove 
133MAKE_ENV+= V=1 
134 
135# We patched makefiles, regen 132# We patched makefiles, regen
136pre-configure: 133pre-configure:
137 ${RUN} cd ${WRKSRC} && ${SH} ./autogen.sh 134 ${RUN} cd ${WRKSRC} && NOCONFIGURE=1 ${SH} ./autogen.sh
138 135
139.if ${OPSYS} == "SunOS" 136.if ${OPSYS} == "SunOS"
140CFLAGS+= -D_XOPEN_SOURCE=600 137CFLAGS+= -D_XOPEN_SOURCE=600
141# Conflicts with the above settings 138# Conflicts with the above settings
142CONFIGURE_ENV+= ac_cv_func_madvise=no 139CONFIGURE_ENV+= ac_cv_func_madvise=no
143CONFIGURE_ARGS+= --with-mcs-docs=no 140CONFIGURE_ARGS+= --with-mcs-docs=no
144CONFIGURE_ARGS+= --enable-dtrace=no 141CONFIGURE_ARGS+= --enable-dtrace=no
145CONFIGURE_ARGS+= --with-sigaltstack=no 142CONFIGURE_ARGS+= --with-sigaltstack=no
146CONFIGURE_ENV+= ac_cv_func_getdomainname=no 143CONFIGURE_ENV+= ac_cv_func_getdomainname=no
147CONFIGURE_ENV+= ac_cv_func_setdomainname=no 144CONFIGURE_ENV+= ac_cv_func_setdomainname=no
148ULIMIT_CMD_datasize= ulimit -d 524288 145ULIMIT_CMD_datasize= ulimit -d 524288
149ULIMIT_CMD_stacksize= ulimit -s 10240 146ULIMIT_CMD_stacksize= ulimit -s 10240
150.elif ${OPSYS} == "NetBSD" 147.elif ${OPSYS} == "NetBSD"
151# Available as a libc symbol, but no declaration. 148# Available as a libc symbol, but no declaration.
152# XXX learn about getvfsstat 149# XXX learn about getvfsstat
153CONFIGURE_ENV+= ac_cv_func_getfsstat=no 150CONFIGURE_ENV+= ac_cv_func_getfsstat=no
154.endif 151.endif
155 152
156.if ${MACHINE_ARCH:M*i[34]86*} 153.if ${MACHINE_ARCH:M*i[34]86*}
157# for gcc byte atomic builtins 154# for gcc byte atomic builtins
158GNU_ARCH.i386= i586 155GNU_ARCH.i386= i586
159CFLAGS+= -march=i586 156CFLAGS+= -march=i586
160.endif 157.endif
161 158
 159PLIST_VARS+= boehm
 160.if ${MACHINE_ARCH} == "aarch64"
 161CONFIGURE_ARGS+= --disable-boehm
 162CONFIGURE_ARGS+= --with-libgc=none
 163.else
 164PLIST.boehm= yes
 165.endif
 166
162# Unsafe JIT, possibly problematic boehm-gc 167# Unsafe JIT, possibly problematic boehm-gc
163NOT_PAX_MPROTECT_SAFE+= bin/mono-sgen 168NOT_PAX_MPROTECT_SAFE+= bin/mono-sgen
164 169
165post-install: 170post-install:
166 ${INSTALL_DATA} ${WRKSRC}/data/net_4_5/DefaultWsdlHelpGenerator.aspx \ 171 ${INSTALL_DATA} ${WRKSRC}/data/net_4_5/DefaultWsdlHelpGenerator.aspx \
167 ${DESTDIR}${EGDIR}/4.5/DefaultWsdlHelpGenerator.aspx 172 ${DESTDIR}${EGDIR}/4.5/DefaultWsdlHelpGenerator.aspx
168 ${INSTALL_DATA} ${WRKSRC}/data/net_4_5/machine.config \ 173 ${INSTALL_DATA} ${WRKSRC}/data/net_4_5/machine.config \
169 ${DESTDIR}${EGDIR}/4.5/machine.config 174 ${DESTDIR}${EGDIR}/4.5/machine.config
170 ${INSTALL_DATA} ${WRKSRC}/data/net_4_5/settings.map \ 175 ${INSTALL_DATA} ${WRKSRC}/data/net_4_5/settings.map \
171 ${DESTDIR}${EGDIR}/4.5/settings.map 176 ${DESTDIR}${EGDIR}/4.5/settings.map
172 ${INSTALL_DATA} ${WRKSRC}/data/net_4_5/web.config \ 177 ${INSTALL_DATA} ${WRKSRC}/data/net_4_5/web.config \
173 ${DESTDIR}${EGDIR}/4.5/web.config 178 ${DESTDIR}${EGDIR}/4.5/web.config
174.if ${OPSYS} == "Darwin" 179.if ${OPSYS} == "Darwin"
cvs diff -r1.4 -r1.5 pkgsrc/lang/mono6/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/mono6/Attic/PLIST 2020/02/12 15:25:15 1.4
+++ pkgsrc/lang/mono6/Attic/PLIST 2020/06/28 17:20:43 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2020/02/12 15:25:15 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.5 2020/06/28 17:20:43 nia Exp $
2bin/al 2bin/al
3bin/al2 3bin/al2
4bin/aprofutil 4bin/aprofutil
5bin/caspol 5bin/caspol
6bin/cccheck 6bin/cccheck
7bin/ccrewrite 7bin/ccrewrite
8bin/cert-sync 8bin/cert-sync
9bin/cert2spc 9bin/cert2spc
10bin/certmgr 10bin/certmgr
11bin/chktrust 11bin/chktrust
12bin/crlupdate 12bin/crlupdate
13bin/csc 13bin/csc
14bin/csharp 14bin/csharp
@@ -34,27 +34,27 @@ bin/mdassembler @@ -34,27 +34,27 @@ bin/mdassembler
34bin/mdbrebase 34bin/mdbrebase
35bin/mdoc 35bin/mdoc
36bin/mdoc-assemble 36bin/mdoc-assemble
37bin/mdoc-export-html 37bin/mdoc-export-html
38bin/mdoc-export-msxdoc 38bin/mdoc-export-msxdoc
39bin/mdoc-update 39bin/mdoc-update
40bin/mdoc-validate 40bin/mdoc-validate
41bin/mdvalidater 41bin/mdvalidater
42bin/mkbundle 42bin/mkbundle
43bin/mod 43bin/mod
44bin/mono 44bin/mono
45bin/mono-api-html 45bin/mono-api-html
46bin/mono-api-info 46bin/mono-api-info
47bin/mono-boehm 47${PLIST.boehm}bin/mono-boehm
48bin/mono-cil-strip 48bin/mono-cil-strip
49bin/mono-configuration-crypto 49bin/mono-configuration-crypto
50bin/mono-find-provides 50bin/mono-find-provides
51bin/mono-find-requires 51bin/mono-find-requires
52bin/mono-gdb.py 52bin/mono-gdb.py
53bin/mono-hang-watchdog 53bin/mono-hang-watchdog
54bin/mono-heapviz 54bin/mono-heapviz
55bin/mono-package-runtime 55bin/mono-package-runtime
56bin/mono-service 56bin/mono-service
57bin/mono-service2 57bin/mono-service2
58bin/mono-sgen 58bin/mono-sgen
59bin/mono-sgen-gdb.py 59bin/mono-sgen-gdb.py
60bin/mono-shlib-cop 60bin/mono-shlib-cop
@@ -131,27 +131,27 @@ lib/libMonoSupportW.la @@ -131,27 +131,27 @@ lib/libMonoSupportW.la
131lib/libikvm-native.la 131lib/libikvm-native.la
132lib/libmono-2.0.a 132lib/libmono-2.0.a
133lib/libmono-2.0.la 133lib/libmono-2.0.la
134lib/libmono-2.0.so 134lib/libmono-2.0.so
135lib/libmono-2.0.so.1 135lib/libmono-2.0.so.1
136lib/libmono-2.0.so.1.0.0 136lib/libmono-2.0.so.1.0.0
137lib/libmono-native.la 137lib/libmono-native.la
138lib/libmono-profiler-aot-static.la 138lib/libmono-profiler-aot-static.la
139lib/libmono-profiler-aot.la 139lib/libmono-profiler-aot.la
140lib/libmono-profiler-coverage-static.la 140lib/libmono-profiler-coverage-static.la
141lib/libmono-profiler-coverage.la 141lib/libmono-profiler-coverage.la
142lib/libmono-profiler-log-static.la 142lib/libmono-profiler-log-static.la
143lib/libmono-profiler-log.la 143lib/libmono-profiler-log.la
144lib/libmonoboehm-2.0.la 144${PLIST.boehm}lib/libmonoboehm-2.0.la
145lib/libmonosgen-2.0.la 145lib/libmonosgen-2.0.la
146lib/mono-source-libs/Options.cs 146lib/mono-source-libs/Options.cs
147lib/mono-source-libs/getline.cs 147lib/mono-source-libs/getline.cs
148lib/mono/2.0-api/Accessibility.dll 148lib/mono/2.0-api/Accessibility.dll
149lib/mono/2.0-api/Commons.Xml.Relaxng.dll 149lib/mono/2.0-api/Commons.Xml.Relaxng.dll
150lib/mono/2.0-api/CustomMarshalers.dll 150lib/mono/2.0-api/CustomMarshalers.dll
151lib/mono/2.0-api/I18N.CJK.dll 151lib/mono/2.0-api/I18N.CJK.dll
152lib/mono/2.0-api/I18N.MidEast.dll 152lib/mono/2.0-api/I18N.MidEast.dll
153lib/mono/2.0-api/I18N.Other.dll 153lib/mono/2.0-api/I18N.Other.dll
154lib/mono/2.0-api/I18N.Rare.dll 154lib/mono/2.0-api/I18N.Rare.dll
155lib/mono/2.0-api/I18N.West.dll 155lib/mono/2.0-api/I18N.West.dll
156lib/mono/2.0-api/I18N.dll 156lib/mono/2.0-api/I18N.dll
157lib/mono/2.0-api/IBM.Data.DB2.dll 157lib/mono/2.0-api/IBM.Data.DB2.dll
@@ -3383,52 +3383,52 @@ share/examples/mono/2.0/web.config @@ -3383,52 +3383,52 @@ share/examples/mono/2.0/web.config
3383share/examples/mono/4.0/Browsers/Compat.browser 3383share/examples/mono/4.0/Browsers/Compat.browser
3384share/examples/mono/4.0/DefaultWsdlHelpGenerator.aspx 3384share/examples/mono/4.0/DefaultWsdlHelpGenerator.aspx
3385share/examples/mono/4.0/machine.config 3385share/examples/mono/4.0/machine.config
3386share/examples/mono/4.0/settings.map 3386share/examples/mono/4.0/settings.map
3387share/examples/mono/4.0/web.config 3387share/examples/mono/4.0/web.config
3388share/examples/mono/4.5/Browsers/Compat.browser 3388share/examples/mono/4.5/Browsers/Compat.browser
3389share/examples/mono/4.5/DefaultWsdlHelpGenerator.aspx 3389share/examples/mono/4.5/DefaultWsdlHelpGenerator.aspx
3390share/examples/mono/4.5/machine.config 3390share/examples/mono/4.5/machine.config
3391share/examples/mono/4.5/settings.map 3391share/examples/mono/4.5/settings.map
3392share/examples/mono/4.5/web.config 3392share/examples/mono/4.5/web.config
3393share/examples/mono/browscap.ini 3393share/examples/mono/browscap.ini
3394share/examples/mono/config 3394share/examples/mono/config
3395share/examples/mono/mconfig/config.xml 3395share/examples/mono/mconfig/config.xml
3396share/libgc-mono/README 3396${PLIST.boehm}share/libgc-mono/README
3397share/libgc-mono/README.DGUX386 3397${PLIST.boehm}share/libgc-mono/README.DGUX386
3398share/libgc-mono/README.Mac 3398${PLIST.boehm}share/libgc-mono/README.Mac
3399share/libgc-mono/README.MacOSX 3399${PLIST.boehm}share/libgc-mono/README.MacOSX
3400share/libgc-mono/README.OS2 3400${PLIST.boehm}share/libgc-mono/README.OS2
3401share/libgc-mono/README.amiga 3401${PLIST.boehm}share/libgc-mono/README.amiga
3402share/libgc-mono/README.arm.cross 3402${PLIST.boehm}share/libgc-mono/README.arm.cross
3403share/libgc-mono/README.autoconf 3403${PLIST.boehm}share/libgc-mono/README.autoconf
3404share/libgc-mono/README.changes 3404${PLIST.boehm}share/libgc-mono/README.changes
3405share/libgc-mono/README.contributors 3405${PLIST.boehm}share/libgc-mono/README.contributors
3406share/libgc-mono/README.cords 3406${PLIST.boehm}share/libgc-mono/README.cords
3407share/libgc-mono/README.darwin 3407${PLIST.boehm}share/libgc-mono/README.darwin
3408share/libgc-mono/README.dj 3408${PLIST.boehm}share/libgc-mono/README.dj
3409share/libgc-mono/README.environment 3409${PLIST.boehm}share/libgc-mono/README.environment
3410share/libgc-mono/README.ews4800 3410${PLIST.boehm}share/libgc-mono/README.ews4800
3411share/libgc-mono/README.hp 3411${PLIST.boehm}share/libgc-mono/README.hp
3412share/libgc-mono/README.linux 3412${PLIST.boehm}share/libgc-mono/README.linux
3413share/libgc-mono/README.macros 3413${PLIST.boehm}share/libgc-mono/README.macros
3414share/libgc-mono/README.rs6000 3414${PLIST.boehm}share/libgc-mono/README.rs6000
3415share/libgc-mono/README.sgi 3415${PLIST.boehm}share/libgc-mono/README.sgi
3416share/libgc-mono/README.solaris2 3416${PLIST.boehm}share/libgc-mono/README.solaris2
3417share/libgc-mono/README.uts 3417${PLIST.boehm}share/libgc-mono/README.uts
3418share/libgc-mono/README.win32 3418${PLIST.boehm}share/libgc-mono/README.win32
3419share/libgc-mono/barrett_diagram 3419${PLIST.boehm}share/libgc-mono/barrett_diagram
3420share/libgc-mono/debugging.html 3420${PLIST.boehm}share/libgc-mono/debugging.html
3421share/libgc-mono/gc.man 3421${PLIST.boehm}share/libgc-mono/gc.man
3422share/libgc-mono/gcdescr.html 3422${PLIST.boehm}share/libgc-mono/gcdescr.html
3423share/libgc-mono/gcinterface.html 3423${PLIST.boehm}share/libgc-mono/gcinterface.html
3424share/libgc-mono/leak.html 3424${PLIST.boehm}share/libgc-mono/leak.html
3425share/libgc-mono/scale.html 3425${PLIST.boehm}share/libgc-mono/scale.html
3426share/libgc-mono/simple_example.html 3426${PLIST.boehm}share/libgc-mono/simple_example.html
3427share/libgc-mono/tree.html 3427${PLIST.boehm}share/libgc-mono/tree.html
3428share/locale/de/LC_MESSAGES/mcs.mo 3428share/locale/de/LC_MESSAGES/mcs.mo
3429share/locale/es/LC_MESSAGES/mcs.mo 3429share/locale/es/LC_MESSAGES/mcs.mo
3430share/locale/ja/LC_MESSAGES/mcs.mo 3430share/locale/ja/LC_MESSAGES/mcs.mo
3431share/locale/pt_BR/LC_MESSAGES/mcs.mo 3431share/locale/pt_BR/LC_MESSAGES/mcs.mo
3432share/mono-2.0/mono/cil/cil-opcodes.xml 3432share/mono-2.0/mono/cil/cil-opcodes.xml
3433share/mono-2.0/mono/eglib/eglib-config.h 3433share/mono-2.0/mono/eglib/eglib-config.h
3434share/mono-2.0/mono/profiler/mono-profiler-coverage.suppression 3434share/mono-2.0/mono/profiler/mono-profiler-coverage.suppression