From dde8e9a63e4e787e64314603657aa6bd4e380128 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 11 Jun 2008 18:48:37 +0000 Subject: fix missing package compile/installation issue git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11441 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- scripts/metadata.pl | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'scripts/metadata.pl') 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) { -- cgit v1.2.3