diff options
| author | rillig <rillig> | 2007-03-08 23:16:06 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-03-08 23:16:06 +0000 |
| commit | 0141ea95ef8df0755d8cff644f1debfef042a350 (patch) | |
| tree | 574b8e84f8382f6a1e1e4a0bbd5b81674fff94ef /mk | |
| parent | a08afa193e86a1fdbcfd913d32c72e8184965f54 (diff) | |
| download | pkgsrc-0141ea95ef8df0755d8cff644f1debfef042a350.tar.gz | |
Moved the build-env target from bsd.pkg.debug.mk to build/build.mk. It
is no longer available to packages that set NO_BUILD.
Added the variable BUILD_ENV_SHELL, since I prefer a comfortable shell
over /bin/sh for interactive work.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.debug.mk | 12 | ||||
| -rw-r--r-- | mk/build/build.mk | 14 |
2 files changed, 14 insertions, 12 deletions
diff --git a/mk/bsd.pkg.debug.mk b/mk/bsd.pkg.debug.mk index 110f14a7b10..27301628fa4 100644 --- a/mk/bsd.pkg.debug.mk +++ b/mk/bsd.pkg.debug.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.debug.mk,v 1.16 2007/02/19 12:19:49 rillig Exp $ +# $NetBSD: bsd.pkg.debug.mk,v 1.17 2007/03/08 23:16:06 rillig Exp $ # # Public targets: # @@ -151,13 +151,3 @@ _show-dbginfo-install: _show-dbginfo-plist-subst: @${PRINTF} "PLIST_SUBST (sorted alphabetically):\\n"; ${PLIST_SUBST:O:@x@${PRINTF} "\\t%s\\n" ${x};@} @${PRINTF} "\\n" - -# -# The build-env target. -# - -.PHONY: build-env -build-env: configure - @${STEP_MSG} "Entering the build environment for ${PKGNAME}" - ${_PKG_SILENT}${_PKG_DEBUG} \ - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} diff --git a/mk/build/build.mk b/mk/build/build.mk index 79e9e6f96b2..1cf0a06ad57 100644 --- a/mk/build/build.mk +++ b/mk/build/build.mk @@ -1,8 +1,14 @@ -# $NetBSD: build.mk,v 1.9 2006/11/09 02:53:15 rillig Exp $ +# $NetBSD: build.mk,v 1.10 2007/03/08 23:16:06 rillig Exp $ # # This file defines what happens in the build phase, excluding the # self-test, which is defined in test.mk. # +# Public targets for developers: +# +# build-env: +# Runs an interactive shell (BUILD_ENV_SHELL) in the environment +# that is used for building the package. +# # Package-settable variables: # # BUILD_MAKE_FLAGS is the list of arguments that is passed to the make @@ -138,3 +144,9 @@ pre-build: post-build: @${DO_NADA} .endif + +BUILD_ENV_SHELL?= ${SH} +build-env: .PHONY configure + @${STEP_MSG} "Entering the build environment for ${PKGNAME}" + ${_PKG_SILENT}${_PKG_DEBUG} \ + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${BUILD_ENV_SHELL} |