diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-27 13:47:29 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-27 13:47:29 +0000 |
| commit | 6a569e5eb8703d684810962141ad660e4448eec2 (patch) | |
| tree | 5088cdfec49078b309c32f9d261f3c4ddf21ac2f /mk/configure | |
| parent | f30f64a12a40abdd7966b46ed41675b7def64713 (diff) | |
| download | pkgsrc-6a569e5eb8703d684810962141ad660e4448eec2.tar.gz | |
After auditing all the packages the ensure that they never invoke the
compiler toolchain until the configure stage, move the "wrapper" stage
back to between "patch" and "configure".
This makes "make extract NO_DEPENDS=" work again for all packages.
Diffstat (limited to 'mk/configure')
| -rw-r--r-- | mk/configure/bsd.configure.mk | 4 | ||||
| -rw-r--r-- | mk/configure/configure.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk index ec252b30767..2a592bdea93 100644 --- a/mk/configure/bsd.configure.mk +++ b/mk/configure/bsd.configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.configure.mk,v 1.8 2006/07/23 15:33:16 jlam Exp $ +# $NetBSD: bsd.configure.mk,v 1.9 2006/07/27 13:47:29 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to configuring packages for building. @@ -27,7 +27,7 @@ _COOKIE.configure= ${WRKDIR}/.configure_done configure: @${DO_NADA} . elif defined(_PKGSRC_BARRIER) -configure: patch configure-cookie +configure: wrapper configure-cookie . else configure: barrier . endif diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk index 6a9bc89df30..44ba46a31ec 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: configure.mk,v 1.8 2006/07/22 16:31:35 jlam Exp $ +# $NetBSD: configure.mk,v 1.9 2006/07/27 13:47:29 jlam Exp $ # # CONFIGURE_SCRIPT is the path to the script to run in order to # configure the software for building. If the path is relative, @@ -39,7 +39,7 @@ _BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS ### configure is a public target to configure the sources for building. ### _CONFIGURE_TARGETS+= check-vulnerable -_CONFIGURE_TARGETS+= patch +_CONFIGURE_TARGETS+= wrapper _CONFIGURE_TARGETS+= acquire-configure-lock _CONFIGURE_TARGETS+= ${_COOKIE.configure} _CONFIGURE_TARGETS+= release-configure-lock |