[pkgsrc/trunk]: pkgsrc/lang/ghc88 Loosen data/address space limit. Allow drop...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ab25b54fc4e5
branches:  trunk
changeset: 414284:ab25b54fc4e5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Mar 24 20:40:15 2020 +0000

description:
Loosen data/address space limit. Allow dropping extra libraries like
libgcc_s.so.1 into files/ and use LD_LIBRARY_PATH consistently.

diffstat:

 lang/ghc88/Makefile     |  6 ++++--
 lang/ghc88/bootstrap.mk |  4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 4c52b3e63be2 -r ab25b54fc4e5 lang/ghc88/Makefile
--- a/lang/ghc88/Makefile       Tue Mar 24 20:38:39 2020 +0000
+++ b/lang/ghc88/Makefile       Tue Mar 24 20:40:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/03/08 16:42:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.12 2020/03/24 20:40:15 joerg Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -14,6 +14,8 @@
 COMMENT=       Compiler for the functional language Haskell - 8.8 Release Series
 LICENSE=       modified-bsd
 
+UNLIMIT_RESOURCES=     datasize virtualsize
+
 # TODO: We should be using the alternatives framework.
 CONFLICTS+=    ghc-[0-9]*
 
@@ -231,7 +233,7 @@
 # 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.
-MAKE_ENV+=     LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib
+ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${FILESDIR}
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff -r 4c52b3e63be2 -r ab25b54fc4e5 lang/ghc88/bootstrap.mk
--- a/lang/ghc88/bootstrap.mk   Tue Mar 24 20:38:39 2020 +0000
+++ b/lang/ghc88/bootstrap.mk   Tue Mar 24 20:40:15 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.5 2020/02/17 17:26:53 jperkin Exp $
+# $NetBSD: bootstrap.mk,v 1.6 2020/03/24 20:40:15 joerg Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -119,7 +119,7 @@
        ${RUN}cd ${WRKDIR}/build-extract/ghc-${BOOT_VERSION}-boot && \
                ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${SH} ./configure \
                        --prefix=${TOOLS_DIR:Q} && \
-               ${MAKE_PROGRAM} install
+               ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install
 
 
 # -----------------------------------------------------------------------------