NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scancpan: remove optional dependency

Browse Source 
there are also runtime dependency

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Francois Perrad 2018-10-16 21:55:03 +02:00 committed by Thomas Petazzoni
parent 53a3ef3602
commit 0cae150f9e
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/scancpan
View File

@ -521,7 +521,6 @@ my %need_host; # name -> 1 if host package is needed
my %need_dlopen; # name -> 1 if requires dynamic library my %need_dlopen; # name -> 1 if requires dynamic library
my %deps_build; # name -> list of host dependencies my %deps_build; # name -> list of host dependencies
my %deps_runtime; # name -> list of target dependencies my %deps_runtime; # name -> list of target dependencies
my %deps_optional; # name -> list of optional target dependencies
my %license_files; # name -> hash of license files my %license_files; # name -> hash of license files
my %checksum; # author -> list of checksum my %checksum; # author -> list of checksum
my $mirror = 'http://cpan.metacpan.org'; # a CPAN mirror my $mirror = 'http://cpan.metacpan.org'; # a CPAN mirror
@ -626,7 +625,6 @@ sub fetch {
} }
$deps_build{$name} = [keys %build]; $deps_build{$name} = [keys %build];
$deps_runtime{$name} = [keys %runtime]; $deps_runtime{$name} = [keys %runtime];
$deps_optional{$name} = [keys %optional];
foreach my $distname (@{$deps_build{$name}}) { foreach my $distname (@{$deps_build{$name}}) {
fetch( $distname, 0, 1 ); fetch( $distname, 0, 1 );
} }
@ -634,7 +632,7 @@ sub fetch {
fetch( $distname, $need_target, $need_host ); fetch( $distname, $need_target, $need_host );
$need_dlopen{$name} ||= $need_dlopen{$distname}; $need_dlopen{$name} ||= $need_dlopen{$distname};
} }
foreach my $distname (@{$deps_optional{$name}}) { foreach my $distname (keys %optional) {
fetch( $distname, $need_target, $need_host ); fetch( $distname, $need_target, $need_host );
} }
} }
@ -748,15 +746,6 @@ while (my ($distname, $dist) = each %dist) {
say {$fh} qq{${brname}_LICENSE = ${license}} if $license; say {$fh} qq{${brname}_LICENSE = ${license}} if $license;
say {$fh} qq{${brname}_LICENSE_FILES = ${license_files}} if $license_files; say {$fh} qq{${brname}_LICENSE_FILES = ${license_files}} if $license_files;
say {$fh} qq{}; say {$fh} qq{};
foreach (sort @{$deps_optional{$distname}}) {
next if grep { $_ eq $distname; } @{$deps_runtime{$_}}; # avoid cyclic dependencies
my $opt_brname = brname( $_ );
my $opt_fsname = fsname( $_ );
say {$fh} qq{ifeq (\$(BR2_PACKAGE_PERL_${opt_brname}),y)};
say {$fh} qq{${brname}_DEPENDENCIES += ${opt_fsname}};
say {$fh} qq{endif};
say {$fh} qq{};
}
say {$fh} qq{\$(eval \$(perl-package))} if $need_target{$distname}; say {$fh} qq{\$(eval \$(perl-package))} if $need_target{$distname};
say {$fh} qq{\$(eval \$(host-perl-package))} if $need_host{$distname}; say {$fh} qq{\$(eval \$(host-perl-package))} if $need_host{$distname};
close $fh; close $fh;