Received: by mail.netbsd.org (Postfix, from userid 605) id 2D1D584E21; Mon, 30 Mar 2020 19:36:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A992084DED for ; Mon, 30 Mar 2020 19:36:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id MtWR5s9nXR2q for ; Mon, 30 Mar 2020 19:36:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1F43184D7B for ; Mon, 30 Mar 2020 19:36:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1D402FB27; Mon, 30 Mar 2020 19:36:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585596964266700" MIME-Version: 1.0 Date: Mon, 30 Mar 2020 19:36:04 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200330193604.1D402FB27@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. --_----------=_1585596964266700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Mon Mar 30 19:36:04 UTC 2020 Modified Files: pkgsrc/lang/ghc7: Makefile pkgsrc/lang/ghc80: Makefile pkgsrc/lang/ghc84: Makefile Log Message: Allow more memory for GHC to waste. Allow dropping extra compat libraries in FILESDIR. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 pkgsrc/lang/ghc7/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ghc80/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ghc84/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1585596964266700 Content-Disposition: inline Content-Length: 3245 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ghc7/Makefile diff -u pkgsrc/lang/ghc7/Makefile:1.43 pkgsrc/lang/ghc7/Makefile:1.44 --- pkgsrc/lang/ghc7/Makefile:1.43 Fri Mar 27 04:13:57 2020 +++ pkgsrc/lang/ghc7/Makefile Mon Mar 30 19:36:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2020/03/27 04:13:57 riastradh Exp $ +# $NetBSD: Makefile,v 1.44 2020/03/30 19:36:03 joerg Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -193,7 +193,7 @@ BUILD_DEPENDS+= compat80-[0-9]*:../../em # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compat80 adds # to the /usr tree can't be applied. -ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib +ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib:${FILESDIR} .endif .include "../../converters/libiconv/buildlink3.mk" Index: pkgsrc/lang/ghc80/Makefile diff -u pkgsrc/lang/ghc80/Makefile:1.6 pkgsrc/lang/ghc80/Makefile:1.7 --- pkgsrc/lang/ghc80/Makefile:1.6 Fri Mar 27 04:13:57 2020 +++ pkgsrc/lang/ghc80/Makefile Mon Mar 30 19:36:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2020/03/27 04:13:57 riastradh Exp $ +# $NetBSD: Makefile,v 1.7 2020/03/30 19:36:03 joerg Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -14,6 +14,8 @@ HOMEPAGE= https://www.haskell.org/ghc/ COMMENT= Compiler for the functional language Haskell - 8.0 Release Series LICENSE= modified-bsd +UNLIMIT_RESOURCES= datasize virtualsize + # TODO: We should be using the alternatives framework. CONFLICTS+= ghc-[0-9]* @@ -191,7 +193,7 @@ BUILD_DEPENDS+= compat80-[0-9]*:../../em # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compat80 adds # to the /usr tree can't be applied. -ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib +ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib:${FILESDIR} .endif .include "../../converters/libiconv/buildlink3.mk" Index: pkgsrc/lang/ghc84/Makefile diff -u pkgsrc/lang/ghc84/Makefile:1.8 pkgsrc/lang/ghc84/Makefile:1.9 --- pkgsrc/lang/ghc84/Makefile:1.8 Fri Mar 27 04:13:57 2020 +++ pkgsrc/lang/ghc84/Makefile Mon Mar 30 19:36:03 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/03/27 04:13:57 riastradh Exp $ +# $NetBSD: Makefile,v 1.9 2020/03/30 19:36:03 joerg Exp $ # ----------------------------------------------------------------------------- # Package metadata # @@ -14,6 +14,8 @@ HOMEPAGE= https://www.haskell.org/ghc/ COMMENT= Compiler for the functional language Haskell - 8.4 Release Series LICENSE= modified-bsd +UNLIMIT_RESOURCES= datasize virtualsize + # TODO: We should be using the alternatives framework. CONFLICTS+= ghc-[0-9]* @@ -209,7 +211,7 @@ BUILD_DEPENDS+= compat80-[0-9]*:../../em # In a sandboxed build environment, we have to reach over to the # installed libraries themselves, since the symlinks compat80 adds # to the /usr tree can't be applied. -ALL_ENV+= LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib +ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib:${FILESDIR} .endif .include "../../converters/libiconv/buildlink3.mk" --_----------=_1585596964266700--