Received: by mail.netbsd.org (Postfix, from userid 605) id CBAE384D7D; Fri, 27 Mar 2020 04:13:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 53FFF84D3A for ; Fri, 27 Mar 2020 04:13:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id niF2AgvyhQGS for ; Fri, 27 Mar 2020 04:13:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 83DD684CD3 for ; Fri, 27 Mar 2020 04:13:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7D690FB27; Fri, 27 Mar 2020 04:13:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158528243732620" MIME-Version: 1.0 Date: Fri, 27 Mar 2020 04:13:57 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20200327041357.7D690FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158528243732620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Fri Mar 27 04:13:57 UTC 2020 Modified Files: pkgsrc/lang/ghc7: Makefile bootstrap.mk pkgsrc/lang/ghc80: Makefile bootstrap.mk pkgsrc/lang/ghc84: Makefile bootstrap.mk Log Message: Set LD_LIBRARY_PATH for compat80 emul in configure step too. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/ghc7/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/ghc7/bootstrap.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ghc80/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ghc80/bootstrap.mk cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/ghc84/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ghc84/bootstrap.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158528243732620 Content-Disposition: inline Content-Length: 5359 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ghc7/Makefile diff -u pkgsrc/lang/ghc7/Makefile:1.42 pkgsrc/lang/ghc7/Makefile:1.43 --- pkgsrc/lang/ghc7/Makefile:1.42 Sun Mar 8 16:42:27 2020 +++ pkgsrc/lang/ghc7/Makefile Fri Mar 27 04:13:57 2020 @@ -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 @@ 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:Q}/emul/netbsd/usr/lib +ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib .endif .include "../../converters/libiconv/buildlink3.mk" Index: pkgsrc/lang/ghc7/bootstrap.mk diff -u pkgsrc/lang/ghc7/bootstrap.mk:1.30 pkgsrc/lang/ghc7/bootstrap.mk:1.31 --- pkgsrc/lang/ghc7/bootstrap.mk:1.30 Fri Feb 14 23:36:54 2020 +++ pkgsrc/lang/ghc7/bootstrap.mk Fri Mar 27 04:13:57 2020 @@ -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 @@ pre-configure: ${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 # ----------------------------------------------------------------------------- Index: pkgsrc/lang/ghc80/Makefile diff -u pkgsrc/lang/ghc80/Makefile:1.5 pkgsrc/lang/ghc80/Makefile:1.6 --- pkgsrc/lang/ghc80/Makefile:1.5 Sun Mar 8 16:42:27 2020 +++ pkgsrc/lang/ghc80/Makefile Fri Mar 27 04:13:57 2020 @@ -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 @@ 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:Q}/emul/netbsd/usr/lib +ALL_ENV+= LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib .endif .include "../../converters/libiconv/buildlink3.mk" Index: pkgsrc/lang/ghc80/bootstrap.mk diff -u pkgsrc/lang/ghc80/bootstrap.mk:1.4 pkgsrc/lang/ghc80/bootstrap.mk:1.5 --- pkgsrc/lang/ghc80/bootstrap.mk:1.4 Mon Feb 17 17:22:43 2020 +++ pkgsrc/lang/ghc80/bootstrap.mk Fri Mar 27 04:13:57 2020 @@ -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 @@ pre-configure: ${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 # ----------------------------------------------------------------------------- Index: pkgsrc/lang/ghc84/Makefile diff -u pkgsrc/lang/ghc84/Makefile:1.7 pkgsrc/lang/ghc84/Makefile:1.8 --- pkgsrc/lang/ghc84/Makefile:1.7 Sun Mar 8 16:42:27 2020 +++ pkgsrc/lang/ghc84/Makefile Fri Mar 27 04:13:57 2020 @@ -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 @@ 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 .endif .include "../../converters/libiconv/buildlink3.mk" Index: pkgsrc/lang/ghc84/bootstrap.mk diff -u pkgsrc/lang/ghc84/bootstrap.mk:1.5 pkgsrc/lang/ghc84/bootstrap.mk:1.6 --- pkgsrc/lang/ghc84/bootstrap.mk:1.5 Mon Feb 17 17:24:06 2020 +++ pkgsrc/lang/ghc84/bootstrap.mk Fri Mar 27 04:13:57 2020 @@ -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 @@ 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 # ----------------------------------------------------------------------------- --_----------=_158528243732620--