RepoMirrors
/
abuild
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

apkbuild-cpan.in: add back non perl dependencies on recreate

This commit is contained in:
Timothy Legge 2020-07-06 19:49:46 +00:00 committed by Natanael Copa
parent dd4cd9d606
commit a3eb828a7c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apkbuild-cpan.in
View File

@ -347,6 +347,10 @@ sub do_depends {
if (defined $oldapkbuild->{'cpandepends'}) {
$oldapkbuild->{'depends'} =~ s/\$cpandepends/$oldapkbuild->{'cpandepends'}/g;
}
my $libs = $oldapkbuild->{'depends'};
$libs =~ s/perl\-\w+[-\w+]+//g;
$libs =~ s/perl//g;
$deps = $deps . " " .$libs;
$deps = sort_pkgs_by_orig ($oldapkbuild->{'depends'}, $deps);
}
@ -374,6 +378,9 @@ sub do_depends {
if (defined $oldapkbuild->{'cpanmakedepends'}) {
$oldapkbuild->{'makedepends'} =~ s/\$cpanmakedepends/$oldapkbuild->{'cpanmakedepends'}/g;
}
my $libs = $oldapkbuild->{'makedepends'};
$libs =~ s/perl\-\w+[-\w+]+//g;
$makedeps = $makedeps . " " .$libs;
$makedeps = sort_pkgs_by_orig ($oldapkbuild->{'makedepends'}, $makedeps);
}
@ -393,6 +400,9 @@ sub do_depends {
if (defined $oldapkbuild->{'cpancheckdepends'}) {
$oldapkbuild->{'checkdepends'} =~ s/\$cpancheckdepends/$oldapkbuild->{'cpancheckdepends'}/g;
}
my $libs = $oldapkbuild->{'checkdepends'};
$libs =~ s/perl\-\w+[-\w+]+//g;
$checkdeps = $checkdeps . " " .$libs;
$checkdeps = sort_pkgs_by_orig ($oldapkbuild->{'checkdepends'}, $checkdeps);
}