[pkgsrc/trunk]: pkgsrc/mk The cookie files are indirectly made using *-cookie...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mk The cookie files are indirectly made using *-cookie...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:43:08 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c57e0757f49
branches:  trunk
changeset: 515712:5c57e0757f49
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jul 06 22:29:52 2006 +0000

description:
The cookie files are indirectly made using *-cookie targets, so verify
that they are never being created more than once by inserting a check
into the *-cookie targets.

diffstat:

 mk/build/bsd.build.mk         |  3 ++-
 mk/build/test.mk              |  3 ++-
 mk/configure/bsd.configure.mk |  3 ++-
 mk/depends/bsd.depends.mk     |  3 ++-
 mk/extract/extract.mk         |  3 ++-
 mk/flavor/pkg/depends.mk      |  4 +++-
 mk/install/bsd.install.mk     |  4 +++-
 mk/package/package.mk         |  3 ++-
 mk/patch/patch.mk             |  3 ++-
 mk/tools/bsd.tools.mk         |  3 ++-
 mk/wrapper/bsd.wrapper.mk     |  3 ++-
 11 files changed, 24 insertions(+), 11 deletions(-)

diffs (183 lines):

diff -r 46b0fdd55401 -r 5c57e0757f49 mk/build/bsd.build.mk
--- a/mk/build/bsd.build.mk     Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/build/bsd.build.mk     Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.4 2006/07/06 17:22:13 jlam Exp $
+# $NetBSD: bsd.build.mk,v 1.5 2006/07/06 22:29:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to building sources for a package.
@@ -42,5 +42,6 @@
 ###
 .PHONY: build-cookie
 build-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_BUILD_COOKIE} || ${FALSE}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_BUILD_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_BUILD_COOKIE}
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/build/test.mk
--- a/mk/build/test.mk  Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/build/test.mk  Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: test.mk,v 1.3 2006/07/06 17:39:36 jlam Exp $
+# $NetBSD: test.mk,v 1.4 2006/07/06 22:29:52 jlam Exp $
 #
 # TEST_DIRS is the list of directories in which to perform the build
 #      process.  If the directories are relative paths, then they
@@ -126,5 +126,6 @@
 ###
 .PHONY: test-cookie
 test-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_TEST_COOKIE} || ${FALSE}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_TEST_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_TEST_COOKIE}
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/configure/bsd.configure.mk
--- a/mk/configure/bsd.configure.mk     Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/configure/bsd.configure.mk     Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.configure.mk,v 1.3 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: bsd.configure.mk,v 1.4 2006/07/06 22:29:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to configuring packages for building.
@@ -38,5 +38,6 @@
 ###
 .PHONY: configure-cookie
 configure-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_CONFIGURE_COOKIE} || ${FALSE}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_CONFIGURE_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_CONFIGURE_COOKIE}
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/depends/bsd.depends.mk
--- a/mk/depends/bsd.depends.mk Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/depends/bsd.depends.mk Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.6 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: bsd.depends.mk,v 1.7 2006/07/06 22:29:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to dependencies.
@@ -77,6 +77,7 @@
 .PHONY: depends-cookie
 .if !target(depends-cookie)
 depends-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_DEPENDS_COOKIE} || ${FALSE}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_DEPENDS_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${_DEPENDS_COOKIE}
 .endif
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/extract/extract.mk
--- a/mk/extract/extract.mk     Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/extract/extract.mk     Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.9 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: extract.mk,v 1.10 2006/07/06 22:29:52 jlam Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -119,6 +119,7 @@
 ###
 .PHONY: extract-cookie
 extract-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_EXTRACT_COOKIE} || ${FALSE}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_EXTRACT_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_EXTRACT_COOKIE}
 
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/flavor/pkg/depends.mk
--- a/mk/flavor/pkg/depends.mk  Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/flavor/pkg/depends.mk  Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.7 2006/06/14 03:00:03 jlam Exp $
+# $NetBSD: depends.mk,v 1.8 2006/07/06 22:29:52 jlam Exp $
 
 _DEPENDS_FILE=         ${WRKDIR}/.depends
 _REDUCE_DEPENDS_CMD=   ${SETENV} CAT=${CAT:Q}                          \
@@ -36,6 +36,8 @@
 ###
 .PHONY: depends-cookie
 depends-cookie: ${_DEPENDS_FILE}
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_DEPENDS_COOKIE} || ${FALSE}
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_DEPENDS_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${_DEPENDS_FILE} ${_DEPENDS_COOKIE}
 
 ${_DEPENDS_FILE}:
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/install/bsd.install.mk
--- a/mk/install/bsd.install.mk Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/install/bsd.install.mk Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.5 2006/07/05 22:21:02 jlam Exp $
+# $NetBSD: bsd.install.mk,v 1.6 2006/07/06 22:29:52 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to installing packages.
@@ -41,4 +41,6 @@
 ###
 .PHONY: install-cookie
 install-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_INSTALL_COOKIE} || ${FALSE}
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_INSTALL_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_INSTALL_COOKIE}
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/package/package.mk
--- a/mk/package/package.mk     Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/package/package.mk     Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.12 2006/07/06 22:08:32 jlam Exp $
+# $NetBSD: package.mk,v 1.13 2006/07/06 22:29:53 jlam Exp $
 
 ######################################################################
 ### package (PUBLIC)
@@ -63,6 +63,7 @@
 ###
 .PHONY: package-cookie
 package-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_PACKAGE_COOKIE} || ${FALSE}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PACKAGE_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_PACKAGE_COOKIE}
 
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/patch/patch.mk
--- a/mk/patch/patch.mk Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/patch/patch.mk Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: patch.mk,v 1.6 2006/07/05 22:21:03 jlam Exp $
+# $NetBSD: patch.mk,v 1.7 2006/07/06 22:29:53 jlam Exp $
 #
 # The following variables may be set in a package Makefile and control
 # how pkgsrc patches are applied.
@@ -108,6 +108,7 @@
 ###
 .PHONY: patch-cookie
 patch-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_PATCH_COOKIE} || ${FALSE}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        if ${TEST} -f ${_PATCH_APPLIED_FILE:Q}; then                    \
                ${MV} -f ${_PATCH_APPLIED_FILE:Q} ${_PATCH_COOKIE:Q};   \
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk     Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/tools/bsd.tools.mk     Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.40 2006/07/05 22:21:03 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.41 2006/07/06 22:29:53 jlam Exp $
 #
 # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -115,6 +115,7 @@
 ###
 .PHONY: tools-cookie
 tools-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_TOOLS_COOKIE} || ${FALSE}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_TOOLS_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${USE_TOOLS:Q} > ${_TOOLS_COOKIE}
 
diff -r 46b0fdd55401 -r 5c57e0757f49 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Thu Jul 06 22:23:21 2006 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Thu Jul 06 22:29:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.46 2006/07/06 18:19:45 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.47 2006/07/06 22:29:53 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -824,5 +824,6 @@
 
 .PHONY: wrapper-cookie
 wrapper-cookie:
+       ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_WRAPPER_COOKIE} || ${FALSE}
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_WRAPPER_COOKIE:H}
        ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_WRAPPER_COOKIE}
Prev by Date: [pkgsrc/trunk]: pkgsrc/graphics/glitz Don't try and do visibility stuff with ...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/sun-jre13 The fake JRE package for Darwin is not ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/graphics/glitz Don't try and do visibility stuff with ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/sun-jre13 The fake JRE package for Darwin is not ...
Indexes:
Home | Main Index | Thread Index | Old Index