diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-07-27 20:02:40 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-07-27 20:02:40 +0000 |
| commit | 4fead3afd5f4e2a571a48caa0ba2181508b0001f (patch) | |
| tree | 6ed531c441c48985bb8d52975234d89268cede41 /lang/mono/Makefile | |
| parent | 2e5a0fa9655b70b1baf96d26310bf09f72e5a394 (diff) | |
| download | pkgsrc-4fead3afd5f4e2a571a48caa0ba2181508b0001f.tar.gz | |
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.
Diffstat (limited to 'lang/mono/Makefile')
| -rw-r--r-- | lang/mono/Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index dd761a9bc31..f691b388538 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -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 search path configuration 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@,libnsl,g' 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 |