kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rearrange sequence so that "wrapper" occurs between "tools" and

Browse source 
"extract".  This allows all user-definable targets (pre-*, do-*,
post-*) to have access to the wrapper scripts.
This commit is contained in:
jlam 2006-07-21 14:21:28 +00:00
parent 3d2f631bb5
commit 4011c5cff2
7 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mk/bsd.pkg.barrier.mk
View file

@ -1,11 +1,11 @@
# $NetBSD: bsd.pkg.barrier.mk,v 1.6 2006/07/07 21:24:27 jlam Exp $
# $NetBSD: bsd.pkg.barrier.mk,v 1.7 2006/07/21 14:21:28 jlam Exp $
_COOKIE.barrier= ${WRKDIR}/.barrier_cookie
# _BARRIER_PRE_TARGETS is a list of the targets that must be built before
# the "barrier" target invokes a new make.
#
_BARRIER_PRE_TARGETS= patch
_BARRIER_PRE_TARGETS= tools
# _BARRIER_POST_TARGETS is a list of the targets that must be built after
# the "barrier" target invokes a new make. This list is specially
@ -13,6 +13,8 @@ _BARRIER_PRE_TARGETS= patch
# then pkgsrc will still do the right thing.
#
_BARRIER_POST_TARGETS= wrapper
_BARRIER_POST_TARGETS+= extract
_BARRIER_POST_TARGETS+= patch
_BARRIER_POST_TARGETS+= configure
_BARRIER_POST_TARGETS+= build
_BARRIER_POST_TARGETS+= test

4
mk/bsd.pkg.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.1873 2006/07/20 17:16:43 rillig Exp $
# $NetBSD: bsd.pkg.mk,v 1.1874 2006/07/21 14:21:28 jlam Exp $
#
# This file is in the public domain.
#
@ -12,9 +12,9 @@
# checksum
# depends
# tools
# wrapper
# extract
# patch
# wrapper
# configure
# build
#

4
mk/configure/configure.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: configure.mk,v 1.6 2006/07/15 23:58:52 rillig Exp $
# $NetBSD: configure.mk,v 1.7 2006/07/21 14:21:28 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+= wrapper
_CONFIGURE_TARGETS+= patch
_CONFIGURE_TARGETS+= acquire-configure-lock
_CONFIGURE_TARGETS+= ${_COOKIE.configure}
_CONFIGURE_TARGETS+= release-configure-lock

11
mk/extract/extract.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: extract.mk,v 1.11 2006/07/07 21:24:28 jlam Exp $
# $NetBSD: extract.mk,v 1.12 2006/07/21 14:21:28 jlam Exp $
#
# The following variables may be set by the package Makefile and
# specify how extraction happens:
@ -43,10 +43,7 @@ _COOKIE.extract= ${WRKDIR}/.extract_done
### extract is a public target to perform extraction.
###
_EXTRACT_TARGETS+= check-vulnerable
_EXTRACT_TARGETS+= checksum
_EXTRACT_TARGETS+= makedirs
_EXTRACT_TARGETS+= depends
_EXTRACT_TARGETS+= tools
_EXTRACT_TARGETS+= wrapper
_EXTRACT_TARGETS+= acquire-extract-lock
_EXTRACT_TARGETS+= ${_COOKIE.extract}
_EXTRACT_TARGETS+= release-extract-lock
@ -56,8 +53,10 @@ _EXTRACT_TARGETS+= release-extract-lock
. if exists(${_COOKIE.extract})
extract:
@${DO_NADA}
. else
. elif exists(${_COOKIE.barrier})
extract: ${_EXTRACT_TARGETS}
. else
extract: barrier
. endif
.endif

6
mk/patch/patch.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: patch.mk,v 1.9 2006/07/13 14:02:34 jlam Exp $
# $NetBSD: patch.mk,v 1.10 2006/07/21 14:21:28 jlam Exp $
#
# The following variables may be set in a package Makefile and control
# how pkgsrc patches are applied.
@ -63,8 +63,10 @@ _PATCH_TARGETS+= release-patch-lock
. if exists(${_COOKIE.patch})
patch:
@${DO_NADA}
. else
. elif exists(${_COOKIE.barrier})
patch: ${_PATCH_TARGETS}
. else
patch: barrier
. endif
.endif

6
mk/tools/bsd.tools.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.tools.mk,v 1.43 2006/07/13 14:02:34 jlam Exp $
# $NetBSD: bsd.tools.mk,v 1.44 2006/07/21 14:21:28 jlam Exp $
#
# Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@ -62,6 +62,10 @@ _COOKIE.tools= ${WRKDIR}/.tools_done
### tools is a public target to create a private directory of tools
### specified by USE_TOOLS.
###
_TOOLS_TARGETS+= check-vulnerable
_TOOLS_TARGETS+= checksum
_TOOLS_TARGETS+= makedirs
_TOOLS_TARGETS+= depends
_TOOLS_TARGETS+= acquire-tools-lock
_TOOLS_TARGETS+= ${_COOKIE.tools}
_TOOLS_TARGETS+= release-tools-lock

4
mk/wrapper/bsd.wrapper.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.wrapper.mk,v 1.48 2006/07/07 21:24:29 jlam Exp $
# $NetBSD: bsd.wrapper.mk,v 1.49 2006/07/21 14:21:28 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@ -781,7 +781,7 @@ _COOKIE.wrapper= ${WRKDIR}/.wrapper_done
wrapper:
@${DO_NADA}
. elif exists(${_COOKIE.barrier})
wrapper: check-vulnerable patch acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock
wrapper: check-vulnerable tools acquire-wrapper-lock ${_COOKIE.wrapper} release-wrapper-lock
. else
wrapper: barrier
. endif