/powerpc64/ and $ret .= "\tselect powerpc64\n";
/nommu/ and $ret .= "\tselect NOMMU\n";
/mips16/ and $ret .= "\tselect HAS_MIPS16\n";
+ /rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n";
}
return $ret;
}
my $parent_condition = shift;
$dep or $dep = {};
$seen or $seen = {};
+ my @t_depends;
$depends or return;
my @depends = @$depends;
next if $condition eq $depend;
next if $seen->{"$parent_condition:$depend"};
+ next if $seen->{":$depend"};
$seen->{"$parent_condition:$depend"} = 1;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
# thus if FOO depends on other config options, these dependencies
# will not be checked. To fix this, we simply emit all of FOO's
# depends here as well.
- $package{$depend} and mconf_depends($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition);
+ $package{$depend} and push @t_depends, [ $package{$depend}->{depends}, $condition ];
$m = "select";
next if $only_dep;
}
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
}
+
+ foreach my $tdep (@t_depends) {
+ mconf_depends($pkgname, $tdep->[0], 1, $dep, $seen, $tdep->[1]);
+ }
+
foreach my $depend (keys %$dep) {
my $m = $dep->{$depend};
$res .= "\t\t$m $depend\n";
$idx = $subdir{$dep}.$dep;
}
$idx .= $suffix;
- undef $idx if $idx =~ /^(kernel\/linux)|(base-files)$/;
+ undef $idx if $idx eq 'base-files';
if ($idx) {
my $depline;
next if $pkg->{src} eq $pkg_dep->{src}.$suffix;