hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[scripts] 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 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27267 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Jo-Philipp Wich 2011-06-23 19:28:16 +00:00
parent ad0af97fc1
commit 70f62578d9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/metadata.pl
View File

@ -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";
}