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

apkbuild-cpan.in: keep arch of old APKBUILD 

also, prevent removal of `arch=""` line,
which is sometimes used for disabled aports
This commit is contained in:
Celeste 2024-01-14 08:36:06 +00:00 committed by Timothy Legge
parent ef6aef38b1
commit 1c771b0d6a
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apkbuild-cpan.in
View File

@ -559,10 +559,12 @@ sub do_depends {
sort_pkgs_by_orig( $oldapkbuild->{'makedepends'}, $makedeps );
}
my $has_xs = length(`find $metaprefix -name '*.xs'`);
my $perldev = (
( defined $oldapkbuild->{'makedepends'}
&& $oldapkbuild->{'makedepends'} =~ 'perl-dev' ) ||
length(`find $metaprefix -name '*.xs'`) )
$has_xs )
? "perl-dev" : '';
if ( defined $makedeps && $makedeps eq '' ) {
if (defined $oldapkbuild->{'makedepends'} && ! $meta) {
@ -629,15 +631,19 @@ sub do_depends {
or die "Can't find pkgdesc line in APKBUILD";
}
if ( length(`find $metaprefix -name '*.xs'`) ) {
if ( !exists $oldapkbuild->{'arch'} ) {
$text =~ s/^arch=\"([^\"]*)\"$/arch="all"/mg
or die "Can't find arch line in APKBUILD";
} else {
$text =~ s/^arch=\"([^\"]*)\"$/arch="$oldapkbuild->{'arch'}"/mg
or die "Can't find arch line in APKBUILD";
}
if ( exists $oldapkbuild->{'arch'} ) {
# Prevent removal of empty arch variable for disabled aports
my $subst_arch = $oldapkbuild->{'arch'}
? '"' . $oldapkbuild->{'arch'} . '"'
: "";
$text =~ s/^arch=\"([^\"]*)\"$/arch=$subst_arch/mg
or die "Can't find arch line in APKBUILD";
} elsif ( $has_xs ) {
$text =~ s/^arch=\"([^\"]*)\"$/arch="all"/mg
or die "Can't find arch line in APKBUILD";
}
if ( defined $license && $license ne 'unknown' ) {
$text =~ s/^license=\"([^\"]*)\"$/license=\"$license\"/mg
or die "Can't find license line in APKBUILD";