15960689 pkgdepend resolve takes longer than it might (fix dir handling, recognize require-any)
--- a/components/a2ps/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/a2ps/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,3 +1,4 @@
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/library
--- a/components/ant/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/ant/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,2 +1,3 @@
+runtime/perl-512
runtime/perl-516
shell/ksh93
--- a/components/apache2/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/apache2/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -6,6 +6,7 @@
library/openldap
library/security/openssl
library/zlib
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/core-os
--- a/components/autogen/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/autogen/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -4,5 +4,6 @@
shell/bash
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
system/library/math
system/linker
--- a/components/convmv/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/convmv/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,1 +1,2 @@
+runtime/perl-512
runtime/perl-516
--- a/components/emacs/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/emacs/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -8,6 +8,7 @@
library/desktop/gdk-pixbuf
library/desktop/gtk2
library/glib2
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/library
--- a/components/enscript/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/enscript/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,3 +1,4 @@
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/library
--- a/components/grails/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/grails/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,3 +1,4 @@
+runtime/perl-512
runtime/perl-516
runtime/python-26
shell/bash
--- a/components/groff/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/groff/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,3 +1,4 @@
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/library
--- a/components/guile/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/guile/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -5,4 +5,5 @@
shell/ksh93
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
system/library/math
--- a/components/gutenprint/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/gutenprint/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -2,6 +2,7 @@
library/glib2
library/print/cups-libs
library/zlib
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/library
--- a/components/hplip/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/hplip/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,6 +1,7 @@
image/library/libjpeg
library/print/cups-libs
library/security/openssl
+runtime/perl-512
runtime/perl-516
runtime/python-26
system/library
--- a/components/lftp/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/lftp/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,6 +1,7 @@
library/expat
library/gnutls
library/readline
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/library
--- a/components/libnet/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/libnet/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,3 +1,4 @@
shell/ksh93
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
--- a/components/mc/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/mc/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,5 +1,6 @@
library/glib2
library/slang
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/library
--- a/components/mutt/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/mutt/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -2,6 +2,7 @@
library/libidn
library/security/openssl
library/slang
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/library
--- a/components/mysql-5-1/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/mysql-5-1/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,6 +1,7 @@
database/mysql-51
library/ncurses
library/zlib
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/core-os
--- a/components/nmap/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/nmap/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -6,5 +6,6 @@
runtime/python-26
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
system/library/libpcap
system/library/math
--- a/components/ntp/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/ntp/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,4 +1,5 @@
library/security/openssl
+runtime/perl-512
runtime/perl-516
service/network/dns/mdns
shell/ksh93
--- a/components/open-fabrics/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/open-fabrics/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,8 +1,10 @@
+runtime/perl-512
runtime/perl-516
runtime/tcl-8
shell/bash
shell/ksh93
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
system/library/math
system/linker
--- a/components/openscap/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/openscap/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -8,5 +8,6 @@
security/compliance/openscap
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
system/library/math
system/library/security/libgcrypt
--- a/components/openssl/openssl-1.0.1/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/openssl/openssl-1.0.1/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,2 +1,3 @@
+runtime/perl-512
runtime/perl-516
system/library
--- a/components/openusb/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/openusb/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -2,6 +2,7 @@
system/hal
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
system/library/libdbus
system/library/libdbus-glib
system/linker
--- a/components/parallel/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/parallel/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,2 +1,3 @@
+runtime/perl-512
runtime/perl-516
shell/which
--- a/components/rsyslog/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/rsyslog/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -6,3 +6,4 @@
shell/ksh93
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
--- a/components/samba/samba/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/samba/samba/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -5,12 +5,14 @@
library/readline
library/samba/libsmbclient
library/zlib
+runtime/perl-512
runtime/perl-516
service/security/kerberos-5
shell/ksh93
system/core-os
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
system/library/security/gss
system/network
system/network/avahi
--- a/components/squid/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/squid/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,10 +1,12 @@
library/libtool/libltdl
library/security/openssl
+runtime/perl-512
runtime/perl-516
shell/ksh93
system/core-os
system/library
system/library/gcc-3-runtime
+system/library/gcc-45-runtime
system/library/math
system/library/security/gss
system/library/security/libsasl
--- a/components/texinfo/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/texinfo/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -1,5 +1,6 @@
library/ncurses
runtime/perl-512
+runtime/python-26
runtime/python-27
shell/bash
shell/ksh93
--- a/components/visual-panels/core/resolve.deps Fri Mar 29 17:28:20 2013 +0000
+++ b/components/visual-panels/core/resolve.deps Fri Mar 29 14:29:29 2013 -0700
@@ -2,6 +2,7 @@
library/java/javahelp
library/libxml2
library/security/openssl
+runtime/java/jre-6
runtime/java/jre-7
shell/ksh93
system/library
--- a/make-rules/ips.mk Fri Mar 29 17:28:20 2013 +0000
+++ b/make-rules/ips.mk Fri Mar 29 14:29:29 2013 -0700
@@ -245,17 +245,17 @@
# These files should contain a list of packages that the component is known to
# depend on. Using resolve.deps is not required, but significantly speeds up
# the "pkg resolve" step.
-EXTDEPFILES = $(wildcard $(addsuffix resolve.deps, $(subst build/, , $(dir $(DEPENDED)))))
+EXTDEPFILES = $(wildcard $(sort $(addsuffix ../resolve.deps, $(dir $(DEPENDED)))))
# This is a target that should only be run by hand, and not something that
# .resolved-$(MACH) should depend on.
sample-resolve.deps:
- echo "<transform depend type=require -> print %(fmri)>" > rd-trans
+ echo "<transform depend type=(require|require-any) -> print %(fmri)>" > rd-trans
for i in build/*.depend; do \
- $(PKGMOGRIFY) -O /dev/null $$i rd-trans | sort -u > m1; \
- $(PKGMOGRIFY) -O /dev/null $$i.res rd-trans | sort -u > m2; \
+ $(PKGMOGRIFY) -O /dev/null $$i rd-trans | tr " " "\n" | sort -u > m1; \
+ $(PKGMOGRIFY) -O /dev/null $$i.res rd-trans | tr " " "\n" | sort -u > m2; \
comm -13 m1 m2; \
- done | sed -e 's/@.*//' -e 's,^pkg:/,,' | sort -u > resolve.deps
+ done | sed -e 's/@[^ ]*//g' -e 's,pkg:/,,g' | sort -u > resolve.deps
$(RM) rd-trans m1 m2
if [[ ! -s resolve.deps ]]; then \
echo "No computed dependencies found; removing empty resolve.deps."; \