From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 23 Jun 2011 19:28:16 +0000 (+0000)
Subject: metadata.pl: fix handling of multiple conditional depends that reference the same... 
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=e745fc762b7388202df2f7506ca1f562c9150197;p=openwrt%2Fstaging%2Fwigyori.git

metadata.pl: fix handling of multiple conditional depends that reference the same package (exposed by previous hotplug2 changes), also kill duplicate dependency specs while we're at it

SVN-Revision: 27267
---

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 7208e16a98..246520bf78 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -696,10 +696,10 @@ sub gen_package_mk() {
 				my $depstr = "\$(curdir)/$idx$suffix/compile";
 				my $depline = get_conditional_dep($condition, $depstr);
 				if ($depline) {
-					$deplines{$dep} = $depline;
+					$deplines{$depline}++;
 				}
 			}
-			my $depline = join(" ", values %deplines);
+			my $depline = join(" ", sort keys %deplines);
 			if ($depline) {
 				$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/$type/compile += $depline\n";
 			}
@@ -756,12 +756,12 @@ sub gen_package_mk() {
 					}
 					$depline = get_conditional_dep($condition, $depstr);
 					if ($depline) {
-						$deplines{$idx.$dep} = $depline;
+						$deplines{$depline}++;
 					}
 				}
 			}
 		}
-		my $depline = join(" ", values %deplines);
+		my $depline = join(" ", sort keys %deplines);
 		if ($depline) {
 			$line .= "\$(curdir)/".$pkg->{subdir}."$pkg->{src}/compile += $depline\n";
 		}