diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-06 14:19:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-06 14:19:10 +0000 |
| commit | 66509a580de6e68da1de16ea0c75c0864f714bb9 (patch) | |
| tree | 0764934707592ff45affd0c1b86c1e8a4a087e8b | |
| parent | 3c3f9b5a28bd624d3d7e608d50dd8fcb4eea2766 (diff) | |
| download | pkgsrc-66509a580de6e68da1de16ea0c75c0864f714bb9.tar.gz | |
We diverged too much from reduce-depends.mk -- reduce-depends.mk
outputted dependencies if they conflicted and it didn't know how to
handle them, whereas reduce-depends.awk was removing them completely.
Restore the old behavior.
This fixes problems that manifest when multiple dependencies can be
built from the same pkgsrc package directory and which don't conflict
with each other, e.g. py23-gtk2 and py23-gtk2 can both be built from
pkgsrc/x11/py-gtk2.
| -rwxr-xr-x | mk/flavor/pkg/reduce-depends.awk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mk/flavor/pkg/reduce-depends.awk b/mk/flavor/pkg/reduce-depends.awk index d7c416fb22f..6ff5bc1d049 100755 --- a/mk/flavor/pkg/reduce-depends.awk +++ b/mk/flavor/pkg/reduce-depends.awk @@ -1,6 +1,6 @@ #!/usr/bin/awk -f # -# $NetBSD: reduce-depends.awk,v 1.1 2006/06/03 23:11:42 jlam Exp $ +# $NetBSD: reduce-depends.awk,v 1.2 2006/06/06 14:19:10 jlam Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -126,10 +126,15 @@ BEGIN { if (match_all == 0) continue reduced[N++] = dep ":" pkgsrcdirs[pkgpath] } - # This should theoretically never happen. - if (match_all == "no") { - print "ERROR: [" PROGNAME "] conflicting dependencies" | ERRCAT - exit 1 + # + # If there are conflicting dependencies, then just pass them + # through and let the rest of the pkgsrc machinery handle it. + # + if (match_all == 0) { + for (d = 1; d <= D; d++) { + dep = depends[pkgpath, d] + reduced[N++] = dep ":" pkgsrcdirs[pkgpath] + } } for (dep in ge_depends) delete ge_depends[dep] |