[Buildroot] [PATCH 1/3] scancpan: remove optional dependency
Francois Perrad
fperrad at gmail.com
Tue Oct 16 19:55:03 UTC 2018
there are also runtime dependency
Signed-off-by: Francois Perrad <francois.perrad at gadz.org>
---
utils/scancpan | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/utils/scancpan b/utils/scancpan
index 01f3abdc8..6b810fdb6 100755
--- a/utils/scancpan
+++ b/utils/scancpan
@@ -521,7 +521,6 @@ my %need_host; # name -> 1 if host package is needed
my %need_dlopen; # name -> 1 if requires dynamic library
my %deps_build; # name -> list of host 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 %checksum; # author -> list of checksum
my $mirror = 'http://cpan.metacpan.org'; # a CPAN mirror
@@ -626,7 +625,6 @@ sub fetch {
}
$deps_build{$name} = [keys %build];
$deps_runtime{$name} = [keys %runtime];
- $deps_optional{$name} = [keys %optional];
foreach my $distname (@{$deps_build{$name}}) {
fetch( $distname, 0, 1 );
}
@@ -634,7 +632,7 @@ sub fetch {
fetch( $distname, $need_target, $need_host );
$need_dlopen{$name} ||= $need_dlopen{$distname};
}
- foreach my $distname (@{$deps_optional{$name}}) {
+ foreach my $distname (keys %optional) {
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_FILES = ${license_files}} if $license_files;
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 \$(host-perl-package))} if $need_host{$distname};
close $fh;
--
2.17.1
More information about the buildroot
mailing list