aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/package-metadata.pl
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-01-06 14:49:08 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-01-13 19:54:43 +0100
commitb2ab9c9d3360160c99ae4f396edb870b6884a995 (patch)
treefb145884f69570abe9caff6ba71cd02e19bf7254 /scripts/package-metadata.pl
parent39be6e7f19c917981365d75527fdd183c6b81ca8 (diff)
downloadupstream-b2ab9c9d3360160c99ae4f396edb870b6884a995.tar.gz
upstream-b2ab9c9d3360160c99ae4f396edb870b6884a995.tar.bz2
upstream-b2ab9c9d3360160c99ae4f396edb870b6884a995.zip
metadata: move 'builddepends' from binary to source packages
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'scripts/package-metadata.pl')
-rwxr-xr-xscripts/package-metadata.pl16
1 files changed, 7 insertions, 9 deletions
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 22de5b1ba0..97b57c65eb 100755
--- 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;