[pkgsrc/trunk]: pkgsrc/lang Set LD_LIBRARY_PATH for compat80 emul in configur...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df43682c121e
branches:  trunk
changeset: 414425:df43682c121e
user:      riastradh <riastradh%pkgsrc.org@localhost>
date:      Fri Mar 27 04:13:57 2020 +0000

description:
Set LD_LIBRARY_PATH for compat80 emul in configure step too.

diffstat:

 lang/ghc7/Makefile      |  4 ++--
 lang/ghc7/bootstrap.mk  |  4 ++--
 lang/ghc80/Makefile     |  4 ++--
 lang/ghc80/bootstrap.mk |  4 ++--
 lang/ghc84/Makefile     |  4 ++--
 lang/ghc84/bootstrap.mk |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diffs (108 lines):

diff -r 3e35770f007c -r df43682c121e lang/ghc7/Makefile
--- a/lang/ghc7/Makefile        Fri Mar 27 03:42:13 2020 +0000
+++ b/lang/ghc7/Makefile        Fri Mar 27 04:13:57 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2020/03/08 16:42:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.43 2020/03/27 04:13:57 riastradh Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -193,7 +193,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:Q}/emul/netbsd/usr/lib
+ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff -r 3e35770f007c -r df43682c121e lang/ghc7/bootstrap.mk
--- a/lang/ghc7/bootstrap.mk    Fri Mar 27 03:42:13 2020 +0000
+++ b/lang/ghc7/bootstrap.mk    Fri Mar 27 04:13:57 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.30 2020/02/14 23:36:54 jperkin Exp $
+# $NetBSD: bootstrap.mk,v 1.31 2020/03/27 04:13:57 riastradh Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -99,7 +99,7 @@
        ${RUN}cd ${WRKDIR:Q}/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
 
 
 # -----------------------------------------------------------------------------
diff -r 3e35770f007c -r df43682c121e lang/ghc80/Makefile
--- a/lang/ghc80/Makefile       Fri Mar 27 03:42:13 2020 +0000
+++ b/lang/ghc80/Makefile       Fri Mar 27 04:13:57 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/03/08 16:42:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.6 2020/03/27 04:13:57 riastradh Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -191,7 +191,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:Q}/emul/netbsd/usr/lib
+ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff -r 3e35770f007c -r df43682c121e lang/ghc80/bootstrap.mk
--- a/lang/ghc80/bootstrap.mk   Fri Mar 27 03:42:13 2020 +0000
+++ b/lang/ghc80/bootstrap.mk   Fri Mar 27 04:13:57 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.4 2020/02/17 17:22:43 jperkin Exp $
+# $NetBSD: bootstrap.mk,v 1.5 2020/03/27 04:13:57 riastradh Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -99,7 +99,7 @@
        ${RUN}cd ${WRKDIR:Q}/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
 
 
 # -----------------------------------------------------------------------------
diff -r 3e35770f007c -r df43682c121e lang/ghc84/Makefile
--- a/lang/ghc84/Makefile       Fri Mar 27 03:42:13 2020 +0000
+++ b/lang/ghc84/Makefile       Fri Mar 27 04:13:57 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/03/08 16:42:27 bsiegert Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/27 04:13:57 riastradh Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -209,7 +209,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
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff -r 3e35770f007c -r df43682c121e lang/ghc84/bootstrap.mk
--- a/lang/ghc84/bootstrap.mk   Fri Mar 27 03:42:13 2020 +0000
+++ b/lang/ghc84/bootstrap.mk   Fri Mar 27 04:13:57 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.5 2020/02/17 17:24:06 jperkin Exp $
+# $NetBSD: bootstrap.mk,v 1.6 2020/03/27 04:13:57 riastradh Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -111,7 +111,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
 
 
 # -----------------------------------------------------------------------------