expanddeps: ignore prereqs for subpacks to be built
authorAndreas Schwab <schwab@linux-m68k.org>
Sat, 18 Aug 2012 10:06:23 +0000 (12:06 +0200)
committerAndreas Schwab <schwab@linux-m68k.org>
Sat, 18 Aug 2012 20:26:51 +0000 (22:26 +0200)
expanddeps

index a51ef18..a96d99e 100755 (executable)
@@ -258,7 +258,9 @@ if ($spec) {
   $packvers = $d->{'version'};
   $subpacks = $d->{'subpacks'};
   @packdeps = @{$d->{'deps'} || []};
-  push(@packdeps, @{$d->{'prereqs'}}) if $d->{'prereqs'};
+  for my $pr (@{$d->{'prereqs'} || []}) {
+    push @packdeps, $pr unless grep {$_ eq $pr} @$subpacks;
+  }
 }
 
 Build::readdeps($cf, undef, \%repo);