summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-11 18:48:37 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-11 18:48:37 +0000
commitdde8e9a63e4e787e64314603657aa6bd4e380128 (patch)
tree94b8e937eb58d0b5e364f563bfd72bee5c06d667
parentc65eeba7d1f77056d05c90757687a5a965fc15cd (diff)
fix missing package compile/installation issue
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11441 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xscripts/metadata.pl23
1 files changed, 12 insertions, 11 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index bd1a40a53..007b63ed9 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -505,17 +505,6 @@ sub gen_package_mk() {
my @srcdeps;
next if defined $pkg->{vdepends};
- next if $done{$pkg->{src}};
- $done{$pkg->{src}} = 1;
-
- foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
- foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
- $dep =~ /@/ or do {
- $dep =~ s/\+//g;
- push @srcdeps, $dep;
- };
- }
- }
if ($ENV{SDK}) {
$conf{$pkg->{src}} or do {
@@ -530,6 +519,18 @@ sub gen_package_mk() {
$pkg->{prereq} and print "prereq-$config += $pkg->{subdir}$pkg->{src}\n";
}
+ next if $done{$pkg->{src}};
+ $done{$pkg->{src}} = 1;
+
+ foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
+ foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
+ $dep =~ /@/ or do {
+ $dep =~ s/\+//g;
+ push @srcdeps, $dep;
+ };
+ }
+ }
+
my $hasdeps = 0;
my $depline = "";
foreach my $deps (@srcdeps) {