ooh, don't merge depends from IGNOREd stuff for MULTI_PACKAGES.

this allows build to proceed faster on some arches by simply not building stuff we don't need
avsm · Oct 3, 2011 · 555848a · 555848a
1 parent d648f7e
commit 555848a
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/infrastructure/lib/DPB/PkgPath.pm b/infrastructure/lib/DPB/PkgPath.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgPath.pm,v 1.11 2011/09/27 17:15:03 espie Exp $
+# $OpenBSD: PkgPath.pm,v 1.12 2011/10/03 08:56:40 espie Exp $
 #
 # Copyright (c) 2010 Marc Espie <[email protected]>
 #
@@ -235,6 +235,15 @@ sub merge_depends
 	my $global2 = bless {}, "AddDepends";
 	for my $v (values %$h) {
 		my $info = $v->{info};
+		if (defined $info->{DIST}) {
+			for my $f (values %{$info->{DIST}}) {
+				$info->{FDEPENDS}{$f} = $f;
+				bless $info->{FDEPENDS}, "AddDepends";
+			}
+		}
+		# XXX don't grab dependencies for IGNOREd stuff
+		next if defined $info->{IGNORE};
+
 		for my $k (qw(LIB_DEPENDS BUILD_DEPENDS)) {
 			if (defined $info->{$k}) {
 				for my $d (values %{$info->{$k}}) {
@@ -251,12 +260,6 @@ sub merge_depends
 				}
 			}
 		}
-		if (defined $info->{DIST}) {
-			for my $f (values %{$info->{DIST}}) {
-				$info->{FDEPENDS}{$f} = $f;
-				bless $info->{FDEPENDS}, "AddDepends";
-			}
-		}
 	}
 	if (values %$global > 0) {
 		for my $v (values %$h) {