summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/ghc7/Makefile4
-rw-r--r--lang/ghc80/Makefile6
-rw-r--r--lang/ghc84/Makefile6
3 files changed, 10 insertions, 6 deletions
diff --git a/lang/ghc7/Makefile b/lang/ghc7/Makefile
index fcde6180ada..30a0d93347c 100644
--- a/lang/ghc7/Makefile
+++ b/lang/ghc7/Makefile
@@ -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]*:../../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.
-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"
diff --git a/lang/ghc80/Makefile b/lang/ghc80/Makefile
index a98631ba42c..a372f7e0f10 100644
--- a/lang/ghc80/Makefile
+++ b/lang/ghc80/Makefile
@@ -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]*:../../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.
-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"
diff --git a/lang/ghc84/Makefile b/lang/ghc84/Makefile
index c04ebd6ffc7..b943fc4248f 100644
--- a/lang/ghc84/Makefile
+++ b/lang/ghc84/Makefile
@@ -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]*:../../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.
-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"