kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mono6: Disable boehm garbage collector on aarch64

Browse source 
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
This commit is contained in:
nia 2020-06-28 17:20:43 +00:00
parent 99ff1e2f47
commit a36d9045bf
2 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lang/mono6/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.18 2020/06/02 08:22:45 adam Exp $
# $NetBSD: Makefile,v 1.19 2020/06/28 17:20:43 nia Exp $
DISTNAME= mono-6.8.0.105
PKGREVISION= 4
PKGREVISION= 5
CATEGORIES= lang
MASTER_SITES= https://download.mono-project.com/sources/mono/
EXTRACT_SUFX= .tar.xz
@ -129,12 +129,9 @@ CHECK_PORTABILITY_SKIP+= acceptance-tests/microbench-perf.sh.in
.include "../../mk/bsd.prefs.mk"
# XXX remove
MAKE_ENV+= V=1
# We patched makefiles, regen
pre-configure:
${RUN} cd ${WRKSRC} && ${SH} ./autogen.sh
${RUN} cd ${WRKSRC} && NOCONFIGURE=1 ${SH} ./autogen.sh
.if ${OPSYS} == "SunOS"
CFLAGS+= -D_XOPEN_SOURCE=600
@ -159,6 +156,14 @@ GNU_ARCH.i386= i586
CFLAGS+= -march=i586
.endif
PLIST_VARS+= boehm
.if ${MACHINE_ARCH} == "aarch64"
CONFIGURE_ARGS+= --disable-boehm
CONFIGURE_ARGS+= --with-libgc=none
.else
PLIST.boehm= yes
.endif
# Unsafe JIT, possibly problematic boehm-gc
NOT_PAX_MPROTECT_SAFE+= bin/mono-sgen

70
lang/mono6/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2020/02/12 15:25:15 ryoon Exp $
@comment $NetBSD: PLIST,v 1.5 2020/06/28 17:20:43 nia Exp $
bin/al
bin/al2
bin/aprofutil
@ -44,7 +44,7 @@ bin/mod
bin/mono
bin/mono-api-html
bin/mono-api-info
bin/mono-boehm
${PLIST.boehm}bin/mono-boehm
bin/mono-cil-strip
bin/mono-configuration-crypto
bin/mono-find-provides
@ -141,7 +141,7 @@ lib/libmono-profiler-coverage-static.la
lib/libmono-profiler-coverage.la
lib/libmono-profiler-log-static.la
lib/libmono-profiler-log.la
lib/libmonoboehm-2.0.la
${PLIST.boehm}lib/libmonoboehm-2.0.la
lib/libmonosgen-2.0.la
lib/mono-source-libs/Options.cs
lib/mono-source-libs/getline.cs
@ -3393,38 +3393,38 @@ 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.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