[pkgsrc/trunk]: pkgsrc/mk Since the "build" target is run inside the pkgsrc b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/630883fb894c
branches:  trunk
changeset: 535957:630883fb894c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Nov 30 18:54:40 2007 +0000

description:
Since the "build" target is run inside the pkgsrc barrier, "build-env"
gets the same treatment.

diffstat:

 mk/bsd.pkg.barrier.mk |  4 ++--
 mk/build/build.mk     |  6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 0e61956719aa -r 630883fb894c mk/bsd.pkg.barrier.mk
--- a/mk/bsd.pkg.barrier.mk     Fri Nov 30 18:30:49 2007 +0000
+++ b/mk/bsd.pkg.barrier.mk     Fri Nov 30 18:54:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.14 2007/08/31 16:30:11 jlam Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.15 2007/11/30 18:54:40 rillig Exp $
 
 _COOKIE.barrier=       ${WRKDIR}/.barrier_cookie
 
@@ -19,7 +19,7 @@
 _BARRIER_POST_TARGETS+=        extract
 _BARRIER_POST_TARGETS+=        patch
 _BARRIER_POST_TARGETS+=        configure
-_BARRIER_POST_TARGETS+=        build
+_BARRIER_POST_TARGETS+=        build build-env
 _BARRIER_POST_TARGETS+=        test
 _BARRIER_POST_TARGETS+=        all
 _BARRIER_POST_TARGETS+=        install
diff -r 0e61956719aa -r 630883fb894c mk/build/build.mk
--- a/mk/build/build.mk Fri Nov 30 18:30:49 2007 +0000
+++ b/mk/build/build.mk Fri Nov 30 18:54:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.13 2007/06/13 20:34:48 rillig Exp $
+# $NetBSD: build.mk,v 1.14 2007/11/30 18:54:40 rillig Exp $
 #
 # This file defines what happens in the build phase, excluding the
 # self-test, which is defined in test.mk.
@@ -159,7 +159,11 @@
 .endif
 
 BUILD_ENV_SHELL?=      ${SH}
+.if defined(_PKGSRC_BARRIER)
 build-env: .PHONY configure
        @${STEP_MSG} "Entering the build environment for ${PKGNAME}"
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL}
+.else
+build-env: barrier
+.endif