diff options
| author | joerg <joerg@pkgsrc.org> | 2007-05-22 16:17:15 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-05-22 16:17:15 +0000 |
| commit | c4412e2ac745d0a1aa369418de6e6592e0f2ead9 (patch) | |
| tree | f30e63f9e3ebc1f367dc97f65f4b4bd2ead14709 /mk/depends | |
| parent | 2ece17c08f00fa3533b3ad39f99a21193e846acd (diff) | |
| download | pkgsrc-c4412e2ac745d0a1aa369418de6e6592e0f2ead9.tar.gz | |
Make depends-cookie a flavor indendepent target. Before it was used to
trace the dependency information. This is computed and stored in
.depends directly now before anything else is done. The output is locked
and the locking is supposed to work before the bootstrap-depends are
installed.
Add a new hook for flavors after all dependencies are added and before
the depends-cookie is created. Use this to compute which package is used
to fulfill each dependency and store it in .rdepends. Adjust
register-dependencies and some other places to use this information
directly instead of recomputing it all the time.
The code to list all dependencies and to recursively install missing
ones is moved to a separate shell script. This makes it easier to
understand what is going on and extend them later.
Change the calling of pkg_create to prepend the dependencies directly to
the passed-in PLIST and not via -P and -T. This is in preperation of
changing the way they are stored in the packages.
Discussed with, recieved minor disagreement about install-dependencies,
but otherwise OKed by jlam.
Diffstat (limited to 'mk/depends')
| -rw-r--r-- | mk/depends/bsd.depends.mk | 7 | ||||
| -rw-r--r-- | mk/depends/depends.mk | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk index cabd14d8749..e481e74b976 100644 --- a/mk/depends/bsd.depends.mk +++ b/mk/depends/bsd.depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.depends.mk,v 1.13 2007/03/23 21:21:33 jlam Exp $ +# $NetBSD: bsd.depends.mk,v 1.14 2007/05/22 16:17:15 joerg Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to dependencies. @@ -97,16 +97,11 @@ depends-clean: ### depends-cookie creates the depends "cookie" state file. This should ### be overridden per package system flavor. ### -### XXX: Why? The other cookies are also created by pkgsrc, not by the -### flavor. -### .PHONY: depends-cookie -.if !target(depends-cookie) depends-cookie: ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.depends} || ${FALSE} ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.depends:H} ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${_COOKIE.depends} -.endif # show-depends: # Prints a list of dependencies. diff --git a/mk/depends/depends.mk b/mk/depends/depends.mk index c0b29653c65..f16780ae26c 100644 --- a/mk/depends/depends.mk +++ b/mk/depends/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.12 2007/03/09 00:39:54 rillig Exp $ +# $NetBSD: depends.mk,v 1.13 2007/05/22 16:17:16 joerg Exp $ ###################################################################### ### depends (PUBLIC) @@ -40,6 +40,7 @@ ${_COOKIE.depends}: real-depends _REAL_DEPENDS_TARGETS+= depends-message _REAL_DEPENDS_TARGETS+= pre-depends-hook _REAL_DEPENDS_TARGETS+= _flavor-install-dependencies +_REAL_DEPENDS_TARGETS+= _flavor-post-install-dependencies _REAL_DEPENDS_TARGETS+= depends-cookie _REAL_DEPENDS_TARGETS+= error-check |