metadata: move 'builddepends' from binary to source packages

[openwrt/staging/chunkeey.git] / scripts / package-metadata.pl

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 22de5b1ba0f33bda4f5315805d7e67ab4304f2c5..97b57c65eb8d5f7a556c3dc48ef7a685bb5d4d76 100755 (executable)
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -446,20 +446,18 @@ sub gen_package_mk() {
                        print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join(' ', @{$src->{buildtypes}})."\n";
                }
 
-               foreach my $spkg (@{$src->{packages}}) {
-                       foreach my $dep (@{$spkg->{depends}}, @{$spkg->{builddepends}}) {
-                               $dep =~ /@/ or do {
-                                       $dep =~ s/\+//g;
-                                       push @srcdeps, $dep;
-                               };
-                       }
+               foreach my $dep (@{$src->{builddepends}}, map { @{$_->{depends}} } @{$src->{packages}}) {
+                       $dep =~ /@/ or do {
+                               $dep =~ s/\+//g;
+                               push @srcdeps, $dep;
+                       };
                }
                foreach my $type (@{$src->{buildtypes}}) {
                        my @extra_deps;
                        my %deplines;
 
-                       next unless $pkg->{"builddepends/$type"};
-                       foreach my $dep (@{$pkg->{"builddepends/$type"}}) {
+                       next unless $src->{"builddepends/$type"};
+                       foreach my $dep (@{$src->{"builddepends/$type"}}) {
                                my $suffix = "";
                                my $deptype = "";
                                my $condition;