Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1581280419124790"
MIME-Version: 1.0
Date: Sun, 9 Feb 2020 20:33:39 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/mk
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
Message-Id: <20200209203339.42E13FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1581280419124790
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sun Feb  9 20:33:39 UTC 2020

Modified Files:
	pkgsrc/mk: bsd.pkg.barrier.mk
	pkgsrc/mk/configure: configure.mk

Log Message:
mk/configure: add configure-env target

This allows easy inspection of the realistic environment in which the
configure scripts are run.

The code is copied from the similar build-env target.

This might help to find the cause for pkg/54894, where "gcc -dumpversion"
is said to output 0 as the version number.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mk/bsd.pkg.barrier.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/configure/configure.mk

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


--_----------=_1581280419124790
Content-Disposition: inline
Content-Length: 2276
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/bsd.pkg.barrier.mk
diff -u pkgsrc/mk/bsd.pkg.barrier.mk:1.19 pkgsrc/mk/bsd.pkg.barrier.mk:1.20
--- pkgsrc/mk/bsd.pkg.barrier.mk:1.19	Thu May 23 13:18:56 2013
+++ pkgsrc/mk/bsd.pkg.barrier.mk	Sun Feb  9 20:33:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.19 2013/05/23 13:18:56 obache Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.20 2020/02/09 20:33:38 rillig Exp $
 
 _COOKIE.barrier=	${WRKDIR}/.barrier_cookie
 
@@ -18,7 +18,7 @@ _BARRIER_POST_TARGETS=	tools
 _BARRIER_POST_TARGETS+=	wrapper
 _BARRIER_POST_TARGETS+=	extract
 _BARRIER_POST_TARGETS+=	patch
-_BARRIER_POST_TARGETS+=	configure
+_BARRIER_POST_TARGETS+=	configure configure-env
 _BARRIER_POST_TARGETS+=	build build-env
 _BARRIER_POST_TARGETS+=	test
 _BARRIER_POST_TARGETS+=	all

Index: pkgsrc/mk/configure/configure.mk
diff -u pkgsrc/mk/configure/configure.mk:1.29 pkgsrc/mk/configure/configure.mk:1.30
--- pkgsrc/mk/configure/configure.mk:1.29	Tue May  7 19:36:44 2019
+++ pkgsrc/mk/configure/configure.mk	Sun Feb  9 20:33:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.29 2019/05/07 19:36:44 rillig Exp $
+# $NetBSD: configure.mk,v 1.30 2020/02/09 20:33:39 rillig Exp $
 #
 # = Package-settable variables =
 #
@@ -288,3 +288,30 @@ configure-help:
 .for d in ${CONFIGURE_DIRS}
 	${RUN} cd ${WRKSRC} && cd ${d} && ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} ${CONFIG_SHELL} ${CONFIGURE_SCRIPT} --help
 .endfor
+
+# configure-env:
+#	Runs an interactive shell in the same environment that is
+#	also used for the configure scripts.
+#
+#	This is only used during development and testing of a package
+#	to work in the same environment as the actual build.
+#
+# User-settable variables:
+#
+# CONFIGURE_ENV_SHELL
+#	The shell to start.
+#
+#	Default: ${CONFIG_SHELL}
+#
+# Keywords: debug configure
+
+configure-env: .PHONY ${_PKGSRC_BARRIER:Ubarrier:D_configure-env}
+_configure-env: .PHONY wrapper
+	@${STEP_MSG} "Entering the configure environment for ${PKGNAME}"
+.if ${CONFIGURE_DIRS:[#]} > 1 || ${CONFIGURE_DIRS} != ${WRKSRC}
+	@${ECHO_MSG} "The CONFIGURE_DIRS are:" \
+		${CONFIGURE_DIRS:S,^${WRKSRC}$,.,:S,^${WRKSRC}/,,:Q}
+.endif
+	${RUN} cd ${WRKSRC} && cd ${d} \
+	&& ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \
+		${CONFIGURE_ENV_SHELL:U${CONFIG_SHELL}}


--_----------=_1581280419124790--