[pkgsrc/trunk]: pkgsrc/mk After auditing all the packages the ensure that the...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c52e7cd4abd0
branches:  trunk
changeset: 516761:c52e7cd4abd0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jul 27 13:47:29 2006 +0000

description:
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:

 mk/bsd.pkg.mk                 |  4 ++--
 mk/configure/bsd.configure.mk |  4 ++--
 mk/configure/configure.mk     |  4 ++--
 mk/extract/extract.mk         |  4 ++--
 mk/wrapper/bsd.wrapper.mk     |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diffs (92 lines):

diff -r 25179061c872 -r c52e7cd4abd0 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Jul 27 13:18:32 2006 +0000
+++ b/mk/bsd.pkg.mk     Thu Jul 27 13:47:29 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1876 2006/07/26 21:23:40 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1877 2006/07/27 13:47:29 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -12,9 +12,9 @@
 #    checksum
 #    depends
 #    tools
-#    wrapper
 #    extract
 #    patch
+#    wrapper
 #    configure
 #    build
 #
diff -r 25179061c872 -r c52e7cd4abd0 mk/configure/bsd.configure.mk
--- a/mk/configure/bsd.configure.mk     Thu Jul 27 13:18:32 2006 +0000
+++ b/mk/configure/bsd.configure.mk     Thu Jul 27 13:47:29 2006 +0000
@@ -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 @@
 configure:
        @${DO_NADA}
 .  elif defined(_PKGSRC_BARRIER)
-configure: patch configure-cookie
+configure: wrapper configure-cookie
 .  else
 configure: barrier
 .  endif
diff -r 25179061c872 -r c52e7cd4abd0 mk/configure/configure.mk
--- a/mk/configure/configure.mk Thu Jul 27 13:18:32 2006 +0000
+++ b/mk/configure/configure.mk Thu Jul 27 13:47:29 2006 +0000
@@ -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 @@
 ### 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
diff -r 25179061c872 -r c52e7cd4abd0 mk/extract/extract.mk
--- a/mk/extract/extract.mk     Thu Jul 27 13:18:32 2006 +0000
+++ b/mk/extract/extract.mk     Thu Jul 27 13:47:29 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.14 2006/07/26 18:29:46 drochner Exp $
+# $NetBSD: extract.mk,v 1.15 2006/07/27 13:47:29 jlam Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -43,7 +43,7 @@
 ### extract is a public target to perform extraction.
 ###
 _EXTRACT_TARGETS+=     check-vulnerable
-_EXTRACT_TARGETS+=     wrapper
+_EXTRACT_TARGETS+=     tools
 _EXTRACT_TARGETS+=     acquire-extract-lock
 _EXTRACT_TARGETS+=     ${_COOKIE.extract}
 _EXTRACT_TARGETS+=     release-extract-lock
diff -r 25179061c872 -r c52e7cd4abd0 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Thu Jul 27 13:18:32 2006 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Thu Jul 27 13:47:29 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.50 2006/07/22 16:31:35 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.51 2006/07/27 13:47:29 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -781,7 +781,7 @@
 wrapper:
        @${DO_NADA}
 .  elif defined(_PKGSRC_BARRIER)
-wrapper: check-vulnerable tools acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock
+wrapper: check-vulnerable patch acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock
 .  else
 wrapper: barrier
 .  endif