gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support/script/scancpan: remove duplicated dependency 

Dependencies from metacpan comes as a list of modules which is
transformed in a list of distribution for BR.  Different modules could
be included in the same distribution, so duplication is possible.

This can for example be seen with the HTTP-Daemon module, which would
get two times the dependencies on HTTP-Message without this commit.

[Thomas: slightly extend commit log.]

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Francois Perrad 2014-12-09 20:32:03 +01:00 committed by Thomas Petazzoni
parent de6d6b9454
commit 315d29e159
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
support/scripts/scancpan
View File

@ -558,8 +558,8 @@ sub fetch {
my $manifest = get_manifest( $result->{author}, $name, $result->{version} ); my $manifest = get_manifest( $result->{author}, $name, $result->{version} );
$need_dlopen{$name} = is_xs( $manifest ); $need_dlopen{$name} = is_xs( $manifest );
$license_files{$name} = find_license_files( $manifest ); $license_files{$name} = find_license_files( $manifest );
my @deps_build = (); my %build = ();
my @deps_runtime = (); my %runtime = ();
my $mb; my $mb;
foreach my $dep (@{$result->{dependency}}) { foreach my $dep (@{$result->{dependency}}) {
my $modname = ${$dep}{module}; my $modname = ${$dep}{module};
@ -578,19 +578,19 @@ sub fetch {
next if !$recommend && ${$dep}{relationship} ne q{requires}; next if !$recommend && ${$dep}{relationship} ne q{requires};
my $distname = $mcpan->module( $modname )->{distribution}; my $distname = $mcpan->module( $modname )->{distribution};
if (${$dep}{phase} eq q{runtime}) { if (${$dep}{phase} eq q{runtime}) {
push @deps_runtime, $distname; $runtime{$distname} = 1;
} }
else { # configure, build else { # configure, build
push @deps_build, $distname; $build{$distname} = 1;
} }
} }
unshift @deps_build, q{Module-Build} if $mb; $build{q{Module-Build}} = 1 if $mb;
$deps_build{$name} = \@deps_build; $deps_build{$name} = [keys %build];
$deps_runtime{$name} = \@deps_runtime; $deps_runtime{$name} = [keys %runtime];
foreach my $distname (@deps_build) { foreach my $distname (@{$deps_build{$name}}) {
fetch( $distname, 0, 1 ); fetch( $distname, 0, 1 );
} }
foreach my $distname (@deps_runtime) { foreach my $distname (@{$deps_runtime{$name}}) {
fetch( $distname, $need_target, $need_host ); fetch( $distname, $need_target, $need_host );
$need_dlopen{$name} ||= $need_dlopen{$distname}; $need_dlopen{$name} ||= $need_dlopen{$distname};
} }