Mon Mar 30 19:36:04 2020 UTC ()
Allow more memory for GHC to waste. Allow dropping extra compat
libraries in FILESDIR.


(joerg)
diff -r1.43 -r1.44 pkgsrc/lang/ghc7/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/ghc80/Makefile
diff -r1.8 -r1.9 pkgsrc/lang/ghc84/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/lang/ghc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc7/Makefile 2020/03/27 04:13:57 1.43
+++ pkgsrc/lang/ghc7/Makefile 2020/03/30 19:36:03 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.43 2020/03/27 04:13:57 riastradh Exp $ 1# $NetBSD: Makefile,v 1.44 2020/03/30 19:36:03 joerg Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-7.10.3-src 5DISTNAME= ghc-7.10.3-src
6PKGREVISION= 3 6PKGREVISION= 3
7PKGNAME= ${DISTNAME:S/-src$//} 7PKGNAME= ${DISTNAME:S/-src$//}
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 7.10 Release Series 14COMMENT= Compiler for the functional language Haskell - 7.10 Release Series
@@ -183,22 +183,22 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -183,22 +183,22 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
183# Dependencies 183# Dependencies
184# 184#
185BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 185BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
186BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 186BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
187 187
188# NetBSD 9.x have libcurses with a newer major version than the 188# NetBSD 9.x have libcurses with a newer major version than the
189# bootstrap kit is linked against. For now, work around this with 189# bootstrap kit is linked against. For now, work around this with
190# compat80. 190# compat80.
191.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 191.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
192BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 192BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
193# In a sandboxed build environment, we have to reach over to the 193# In a sandboxed build environment, we have to reach over to the
194# installed libraries themselves, since the symlinks compat80 adds 194# installed libraries themselves, since the symlinks compat80 adds
195# to the /usr tree can't be applied. 195# to the /usr tree can't be applied.
196ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib 196ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib:${FILESDIR}
197.endif 197.endif
198 198
199.include "../../converters/libiconv/buildlink3.mk" 199.include "../../converters/libiconv/buildlink3.mk"
200.include "../../devel/libffi/buildlink3.mk" 200.include "../../devel/libffi/buildlink3.mk"
201.include "../../devel/gmp/buildlink3.mk" 201.include "../../devel/gmp/buildlink3.mk"
202.include "../../mk/curses.buildlink3.mk" 202.include "../../mk/curses.buildlink3.mk"
203.include "../../mk/pthread.buildlink3.mk" 203.include "../../mk/pthread.buildlink3.mk"
204.include "../../mk/bsd.pkg.mk" 204.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/lang/ghc80/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc80/Makefile 2020/03/27 04:13:57 1.6
+++ pkgsrc/lang/ghc80/Makefile 2020/03/30 19:36:03 1.7
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: Makefile,v 1.6 2020/03/27 04:13:57 riastradh Exp $ 1# $NetBSD: Makefile,v 1.7 2020/03/30 19:36:03 joerg Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-8.0.2-src 5DISTNAME= ghc-8.0.2-src
6PKGNAME= ${DISTNAME:S/-src$//} 6PKGNAME= ${DISTNAME:S/-src$//}
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 8.0 Release Series 14COMMENT= Compiler for the functional language Haskell - 8.0 Release Series
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
 17UNLIMIT_RESOURCES= datasize virtualsize
 18
17# TODO: We should be using the alternatives framework. 19# TODO: We should be using the alternatives framework.
18CONFLICTS+= ghc-[0-9]* 20CONFLICTS+= ghc-[0-9]*
19 21
20# GHC requires GHC to build itself. Formerly we could work around this 22# GHC requires GHC to build itself. Formerly we could work around this
21# bootstrapping problem by creating a special archive containing C 23# bootstrapping problem by creating a special archive containing C
22# sources compiled from Haskell sources, but that's no longer 24# sources compiled from Haskell sources, but that's no longer
23# possible. So we have to prepare stripped-down binaries sufficient to 25# possible. So we have to prepare stripped-down binaries sufficient to
24# bootstrap compilers for each platforms. If you want to build them 26# bootstrap compilers for each platforms. If you want to build them
25# yourself, follow instructions in BOOTSTRAP.txt and ./bootstrap.mk 27# yourself, follow instructions in BOOTSTRAP.txt and ./bootstrap.mk
26#BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-powerpc # Not available yet 28#BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-powerpc # Not available yet
27BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-i386 29BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-i386
28BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-x86_64 30BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-x86_64
29BROKEN_EXCEPT_ON_PLATFORM+= NetBSD-*-x86_64 31BROKEN_EXCEPT_ON_PLATFORM+= NetBSD-*-x86_64
@@ -181,22 +183,22 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -181,22 +183,22 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
181# 183#
182BUILDLINK_DEPMETHOD.python:= build 184BUILDLINK_DEPMETHOD.python:= build
183.include "../../lang/python/pyversion.mk" 185.include "../../lang/python/pyversion.mk"
184BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 186BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
185 187
186# NetBSD 9.x have libcurses with a newer major version than the 188# NetBSD 9.x have libcurses with a newer major version than the
187# bootstrap kit is linked against. For now, work around this with 189# bootstrap kit is linked against. For now, work around this with
188# compat80. 190# compat80.
189.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 191.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
190BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 192BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
191# In a sandboxed build environment, we have to reach over to the 193# In a sandboxed build environment, we have to reach over to the
192# installed libraries themselves, since the symlinks compat80 adds 194# installed libraries themselves, since the symlinks compat80 adds
193# to the /usr tree can't be applied. 195# to the /usr tree can't be applied.
194ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib 196ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib:${FILESDIR}
195.endif 197.endif
196 198
197.include "../../converters/libiconv/buildlink3.mk" 199.include "../../converters/libiconv/buildlink3.mk"
198.include "../../devel/libffi/buildlink3.mk" 200.include "../../devel/libffi/buildlink3.mk"
199.include "../../devel/gmp/buildlink3.mk" 201.include "../../devel/gmp/buildlink3.mk"
200.include "../../mk/curses.buildlink3.mk" 202.include "../../mk/curses.buildlink3.mk"
201.include "../../mk/pthread.buildlink3.mk" 203.include "../../mk/pthread.buildlink3.mk"
202.include "../../mk/bsd.pkg.mk" 204.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/lang/ghc84/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc84/Makefile 2020/03/27 04:13:57 1.8
+++ pkgsrc/lang/ghc84/Makefile 2020/03/30 19:36:03 1.9
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: Makefile,v 1.8 2020/03/27 04:13:57 riastradh Exp $ 1# $NetBSD: Makefile,v 1.9 2020/03/30 19:36:03 joerg Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-8.4.4-src 5DISTNAME= ghc-8.4.4-src
6PKGNAME= ${DISTNAME:S/-src$//} 6PKGNAME= ${DISTNAME:S/-src$//}
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/ 9MASTER_SITES= https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= https://www.haskell.org/ghc/ 13HOMEPAGE= https://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell - 8.4 Release Series 14COMMENT= Compiler for the functional language Haskell - 8.4 Release Series
15LICENSE= modified-bsd 15LICENSE= modified-bsd
16 16
 17UNLIMIT_RESOURCES= datasize virtualsize
 18
17# TODO: We should be using the alternatives framework. 19# TODO: We should be using the alternatives framework.
18CONFLICTS+= ghc-[0-9]* 20CONFLICTS+= ghc-[0-9]*
19 21
20# GHC requires GHC to build itself. We have to prepare stripped-down 22# GHC requires GHC to build itself. We have to prepare stripped-down
21# binaries sufficient to bootstrap compilers for each platforms. If 23# binaries sufficient to bootstrap compilers for each platforms. If
22# you want to build them yourself, follow instructions in 24# you want to build them yourself, follow instructions in
23# BOOTSTRAP.txt and ./bootstrap.mk 25# BOOTSTRAP.txt and ./bootstrap.mk
24#BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-powerpc # Not available yet 26#BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-powerpc # Not available yet
25BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-x86_64 27BROKEN_EXCEPT_ON_PLATFORM+= Darwin-*-x86_64
26BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-i386 28BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-i386
27BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-x86_64 29BROKEN_EXCEPT_ON_PLATFORM+= FreeBSD-*-x86_64
28BROKEN_EXCEPT_ON_PLATFORM+= NetBSD-*-x86_64 30BROKEN_EXCEPT_ON_PLATFORM+= NetBSD-*-x86_64
29#BROKEN_EXCEPT_ON_PLATFORM+= SunOS-*-i386 # Not available yet 31#BROKEN_EXCEPT_ON_PLATFORM+= SunOS-*-i386 # Not available yet
@@ -199,22 +201,22 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV} @@ -199,22 +201,22 @@ STRIP_FILES_SKIP+= lib/${PKGNAME_NOREV}
199BUILDLINK_DEPMETHOD.python:= build 201BUILDLINK_DEPMETHOD.python:= build
200.include "../../lang/python/pyversion.mk" 202.include "../../lang/python/pyversion.mk"
201BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 203BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
202.endif 204.endif
203 205
204# NetBSD 9.x have libcurses with a newer major version than the 206# NetBSD 9.x have libcurses with a newer major version than the
205# bootstrap kit is linked against. For now, work around this with 207# bootstrap kit is linked against. For now, work around this with
206# compat80. 208# compat80.
207.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 209.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
208BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80 210BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
209# In a sandboxed build environment, we have to reach over to the 211# In a sandboxed build environment, we have to reach over to the
210# installed libraries themselves, since the symlinks compat80 adds 212# installed libraries themselves, since the symlinks compat80 adds
211# to the /usr tree can't be applied. 213# to the /usr tree can't be applied.
212ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib 214ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib:${FILESDIR}
213.endif 215.endif
214 216
215.include "../../converters/libiconv/buildlink3.mk" 217.include "../../converters/libiconv/buildlink3.mk"
216.include "../../devel/libffi/buildlink3.mk" 218.include "../../devel/libffi/buildlink3.mk"
217.include "../../devel/gmp/buildlink3.mk" 219.include "../../devel/gmp/buildlink3.mk"
218.include "../../mk/curses.buildlink3.mk" 220.include "../../mk/curses.buildlink3.mk"
219.include "../../mk/pthread.buildlink3.mk" 221.include "../../mk/pthread.buildlink3.mk"
220.include "../../mk/bsd.pkg.mk" 222.include "../../mk/bsd.pkg.mk"