From 6670e9479da26898a2ed6996064ae647f82fe1c3 Mon Sep 17 00:00:00 2001 From: Timothy Legge Date: Tue, 3 Mar 2020 23:03:42 +0000 Subject: apkbuild-cpan.in: perl and perl-dev as depends and makedepends fix issue with how perl-dev was added as a makedepends perl probably should be a dependency of all per modules --- apkbuild-cpan.in | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/apkbuild-cpan.in b/apkbuild-cpan.in index cc1b416..a251c9d 100755 --- a/apkbuild-cpan.in +++ b/apkbuild-cpan.in @@ -36,7 +36,7 @@ pkgdesc="Perl module for [% pkgreal %]" url="https://metacpan.org/release/[% pkgreal %]/" arch="noarch" license="GPL-1.0-or-later OR Artistic-1.0-Perl" -depends="" +depends="perl" makedepends="perl-dev" checkdepends="" subpackages="$pkgname-doc" @@ -272,6 +272,11 @@ sub do_depends { say "License: $license"; my $deps = parse_deps $meta->effective_prereqs->requirements_for('runtime', 'requires'); + if ($deps eq '') { + $deps = "perl"; + } else { + $deps = "perl " . $deps; + } say "CPAN deps: $deps"; say "Recommend: " . parse_deps $meta->effective_prereqs->requirements_for('runtime', 'recommends'); @@ -281,6 +286,11 @@ sub do_depends { $meta->effective_prereqs->requirements_for('build', 'requires'), $meta->effective_prereqs->requirements_for('build', 'recommends') ); + if ($makedeps eq '') { + $makedeps = "perl-dev"; + } else { + $makedeps = "perl-dev " . $makedeps; + } say "CPAN build deps: $makedeps"; say "CPAN requires: " . parse_deps($meta->effective_prereqs->requirements_for('configure', 'requires'), $meta->effective_prereqs->requirements_for('build', 'requires')); say "CPAN recommends: " . parse_deps($meta->effective_prereqs->requirements_for('configure', 'recommends'), $meta->effective_prereqs->requirements_for('build', 'recommends')); @@ -305,7 +315,7 @@ sub do_depends { $text =~ s/(license=.*\n)/$1depends=\"$deps\"\n/gm or die "Can't insert depends line in APKBUILD"; - $text =~ s/^makedepends=\"([^\"]*)\"$/makedepends=\"perl-dev $makedeps\"/mg or + $text =~ s/^makedepends=\"([^\"]*)\"$/makedepends=\"$makedeps\"/mg or $text =~ s/(depends=.*\n)/$1makedepends=\"$makedeps\"\n/gm or die "Can't insert makedepends line in APKBUILD"; -- cgit v1.2.3