cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oops, do not unset SUBPACKAGE

Browse Source 
Move BULK_COOKIE for package to the redirector, so that we do not
clean in subpackage cases, but instead wait for all the packages to be built.

Also, introduce FORCE_UPDATE=hard: with signatures, -F installed is
most often not necessary...
This commit is contained in:
espie 2006-10-02 17:26:34 +00:00
parent 78453474a1
commit 984b811337
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*- #-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make: # ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.774 2006/10/02 09:37:14 espie Exp $ # $OpenBSD: bsd.port.mk,v 1.775 2006/10/02 17:26:34 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $ # $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $ # $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
# #
@ -1128,9 +1128,12 @@ _build_depends_target?=${DEPENDS_TARGET}
_run_depends_target=${DEPENDS_TARGET} _run_depends_target=${DEPENDS_TARGET}
_regress_depends_target=${DEPENDS_TARGET} _regress_depends_target=${DEPENDS_TARGET}
.if ${FORCE_UPDATE:L} == "yes" .if ${FORCE_UPDATE:L} == "yes" || ${FORCE_UPDATE:L} == "hard"
_force_update_fragment=eval $$toset ${MAKE} subupdate _force_update_fragment=eval $$toset ${MAKE} subupdate
_PKG_ADD_FORCE=-F update -F updatedepends -F installed -r _PKG_ADD_FORCE=-F update -F updatedepends -r
. if ${FORCE_UPDATE:L} == "hard"
_PKG_ADD_FORCE+= -F installed
. endif
.else .else
_force_update_fragment=: _force_update_fragment=:
_PKG_ADD_FORCE= _PKG_ADD_FORCE=
@ -1153,9 +1156,9 @@ _DEP${_DEP}_COOKIES+=${WRKDIR}/.${_DEP}${_i:C,[|:./<=>*],-,g}
_INSTALL_DEPS=${_INSTALL_COOKIE} _INSTALL_DEPS=${_INSTALL_COOKIE}
_PACKAGE_DEPS=${_PACKAGE_COOKIES} _PACKAGE_DEPS=${_PACKAGE_COOKIES}
_UPDATE_DEPS=${_UPDATE_COOKIE} _UPDATE_DEPS=${_UPDATE_COOKIE}
_BULK__internal-package=Yes
.if ${BULK_${PKGPATH}:L} == "yes" .if ${BULK_${PKGPATH}:L} == "yes"
_INSTALL_DEPS+=${_BULK_COOKIE} _INSTALL_DEPS+=${_BULK_COOKIE}
_PACKAGE_DEPS+=${_BULK_COOKIE}
_UPDATE_DEPS+=${_BULK_COOKIE} _UPDATE_DEPS+=${_BULK_COOKIE}
.endif .endif
@ -1316,7 +1319,7 @@ ${_PACKAGE_COOKIE}:
{ ln $$f $@ 2>/dev/null || cp -p $$f $@ ; } || \ { ln $$f $@ 2>/dev/null || cp -p $$f $@ ; } || \
cd ${.CURDIR} && ${MAKE} _TRIED_FETCHING=Yes $@ cd ${.CURDIR} && ${MAKE} _TRIED_FETCHING=Yes $@
.else .else
@cd ${.CURDIR} && unset PACKAGING SUBPACKAGE|| true && exec ${MAKE} ${_PACKAGE_COOKIE_DEPS} ${_PKG_PREREQ} @cd ${.CURDIR} && unset PACKAGING || true && exec ${MAKE} ${_PACKAGE_COOKIE_DEPS} ${_PKG_PREREQ}
. if target(pre-package) . if target(pre-package)
@cd ${.CURDIR} && exec ${MAKE} pre-package @cd ${.CURDIR} && exec ${MAKE} pre-package
. endif . endif
@ -1756,6 +1759,9 @@ ${_t}:
@cd ${.CURDIR} && SUBPACKAGE='${_s}' PACKAGING='${_s}' exec ${MAKE} ${_r} @cd ${.CURDIR} && SUBPACKAGE='${_s}' PACKAGING='${_s}' exec ${MAKE} ${_r}
. endfor . endfor
. endif . endif
. if defined(_BULK_${_t}) && ${BULK_${PKGPATH}:L} == "yes"
@cd ${.CURDIR} && exec ${MAKE} ${_BULK_COOKIE}
. endif
.endfor .endfor
${_BULK_COOKIE}: ${_PACKAGE_COOKIES} ${_BULK_COOKIE}: ${_PACKAGE_COOKIES}