CVS commit: pkgsrc/lang/ghc88

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Mar 24 20:40:16 UTC 2020

Modified Files:
        pkgsrc/lang/ghc88: Makefile bootstrap.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ghc88/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ghc88/bootstrap.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ghc88/Makefile
diff -u pkgsrc/lang/ghc88/Makefile:1.11 pkgsrc/lang/ghc88/Makefile:1.12
--- pkgsrc/lang/ghc88/Makefile:1.11     Sun Mar  8 16:42:27 2020
+++ pkgsrc/lang/ghc88/Makefile  Tue Mar 24 20:40:15 2020
@@ -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 @@ HOMEPAGE=     https://www.haskell.org/ghc/
 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 @@ 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.
-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"

Index: pkgsrc/lang/ghc88/bootstrap.mk
diff -u pkgsrc/lang/ghc88/bootstrap.mk:1.5 pkgsrc/lang/ghc88/bootstrap.mk:1.6
--- pkgsrc/lang/ghc88/bootstrap.mk:1.5  Mon Feb 17 17:26:53 2020
+++ pkgsrc/lang/ghc88/bootstrap.mk      Tue Mar 24 20:40:15 2020
@@ -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 @@ pre-configure:
        ${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
 
 
 # -----------------------------------------------------------------------------