diff options
| author | jlam <jlam> | 2006-07-22 16:31:35 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-22 16:31:35 +0000 |
| commit | 33a884349bd642eac402828fa3368078ec7e15af (patch) | |
| tree | b15a0a1dd1ed6c8c5f4175ac698be426219294a6 /mk/bsd.pkg.barrier.mk | |
| parent | d6d491950747fe879f71fd3024cc98dc5c6c3baa (diff) | |
| download | pkgsrc-33a884349bd642eac402828fa3368078ec7e15af.tar.gz | |
Modify the barrier so that we always invoke the recursive make process
when passing through the barrier. This ensures the PATH (passed via
PKGSRC_MAKE_ENV) is correctly set for all phases after the barrier.
This fixes a bug in "interactive" pkgsrc use, where if you have no
work directory and type "make build && make install", then the "install"
step does not have a PATH set to include all the wrapper and tools
directories.
Diffstat (limited to 'mk/bsd.pkg.barrier.mk')
| -rw-r--r-- | mk/bsd.pkg.barrier.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk index 71df9548278..9cbdeccb7a5 100644 --- a/mk/bsd.pkg.barrier.mk +++ b/mk/bsd.pkg.barrier.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.barrier.mk,v 1.8 2006/07/21 14:27:56 jlam Exp $ +# $NetBSD: bsd.pkg.barrier.mk,v 1.9 2006/07/22 16:31:35 jlam Exp $ _COOKIE.barrier= ${WRKDIR}/.barrier_cookie @@ -40,7 +40,7 @@ _BARRIER_CMDLINE_TARGETS+= ${_target_} ### target invokes a new make should be listed in _BARRIER_POST_TARGETS, ### and should be of the form: ### -### .if !exists(${_COOKIE.barrier}) +### .if !defined(_PKGSRC_BARRIER) ### foo: barrier ### .else ### foo: foo's real source dependencies @@ -52,11 +52,11 @@ _BARRIER_CMDLINE_TARGETS+= ${_target_} .PHONY: barrier barrier: ${_BARRIER_PRE_TARGETS} ${_COOKIE.barrier} -.if !exists(${_COOKIE.barrier}) +.if !defined(_PKGSRC_BARRIER) . if defined(PKG_VERBOSE) @${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}" . endif - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} ${MAKEFLAGS} ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} . if defined(PKG_VERBOSE) @${PHASE_MSG} "Leaving \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}" . endif |