diff options
| author | joerg <joerg@pkgsrc.org> | 2020-03-24 20:40:15 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-03-24 20:40:15 +0000 |
| commit | d0bc6400db58e8ceda37599d4fbf69991fc19347 (patch) | |
| tree | 1e96135afd103c7ec97b3e785745a800ec1355ff /lang/ghc88 | |
| parent | 9a962759f556549572857bebaf294dfba12759f7 (diff) | |
| download | pkgsrc-d0bc6400db58e8ceda37599d4fbf69991fc19347.tar.gz | |
Loosen data/address space limit. Allow dropping extra libraries like
libgcc_s.so.1 into files/ and use LD_LIBRARY_PATH consistently.
Diffstat (limited to 'lang/ghc88')
| -rw-r--r-- | lang/ghc88/Makefile | 6 | ||||
| -rw-r--r-- | lang/ghc88/bootstrap.mk | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lang/ghc88/Makefile b/lang/ghc88/Makefile index d0322ec7f8f..f4f0ca7ceaa 100644 --- a/lang/ghc88/Makefile +++ b/lang/ghc88/Makefile @@ -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]*:../../emulators/compat80 # 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 --git a/lang/ghc88/bootstrap.mk b/lang/ghc88/bootstrap.mk index 3d701a72c58..90065721a61 100644 --- a/lang/ghc88/bootstrap.mk +++ b/lang/ghc88/bootstrap.mk @@ -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 # ----------------------------------------------------------------------------- |