Reset condition for each dependeny when generating mconf files. Previously all

dependencys listed after a conditional dependency had the same condition.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14335 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index da29fdd895c26d86cac0f2e4b608886428d46bdc..fa30556205d260034bd12f7570acf877e4d88b10 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -375,7 +375,7 @@ sub mconf_depends {
        my $res;
        my $dep = shift;
        my $seen = shift;
-       my $condition = shift;
+       my $parent_condition = shift;
        $dep or $dep = {};
        $seen or $seen = {};
 
@@ -386,11 +386,12 @@ sub mconf_depends {
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
                my $vdep;
+               my $condition;
 
                if ($depend =~ /^(.+):(.+)$/) {
                        if ($1 ne "PACKAGE_$pkgname") {
-                               if ($condition) {
-                                       $condition = "$condition && $1";
+                               if ($parent_condition) {
+                                       $condition = "$parent_condition && $1";
                                } else {
                                        $condition = $1;
                                }