oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apkbuild-cpan: remove prepare function from APKBUILD

Browse Source 
the generation of Makefile is comparable with running configure, which
we normally do in the build() function, not in prepare.

also fix some whitespace damamge.
This commit is contained in:
Natanael Copa 2019-03-21 11:25:52 +01:00
parent ede4203749
commit 122bcd7cb2
1 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apkbuild-cpan.in
View File

@ -44,26 +44,15 @@ subpackages="$pkgname-doc"
source="[% source %]" source="[% source %]"
builddir="$srcdir/$_pkgreal-$pkgver" builddir="$srcdir/$_pkgreal-$pkgver"
prepare() {
default_prepare
cd "$builddir"
if [ -e Build.PL ]; then
perl Build.PL installdirs=vendor
else
PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
fi
}
build() { build() {
: :
} }
package() { check() {
: :
} }
check() { package() {
: :
} }
@ -174,26 +163,17 @@ sub prepare_tree {
sub update_functions { sub update_functions {
my $apkbuild = read_apkbuild; my $apkbuild = read_apkbuild;
my $metaprefix = "src/" . $apkbuild->{'_pkgreal'} . "-" . $apkbuild->{'pkgver'} . "/"; my $metaprefix = "src/" . $apkbuild->{'_pkgreal'} . "-" . $apkbuild->{'pkgver'} . "/";
my $prepare_func;
my $build_func; my $build_func;
my $check_func; my $check_func;
my $package_func; my $package_func;
my $text = read_file "APKBUILD"; my $text = read_file "APKBUILD";
if (-e "$metaprefix/Build.PL" ) { if (-e "$metaprefix/Build.PL" ) {
$prepare_func = <<'EOF';
prepare() {
default_prepare
cd "$builddir"
export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
perl Build.PL installdirs=vendor
}
EOF
$build_func = <<'EOF'; $build_func = <<'EOF';
build() { build() {
cd "$builddir" cd "$builddir"
export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
perl Build.PL installdirs=vendor
./Build ./Build
} }
EOF EOF
@ -211,19 +191,11 @@ check() {
} }
EOF EOF
} else { } else {
$prepare_func = <<'EOF';
prepare() {
default_prepare
cd "$builddir"
export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
}
EOF
$build_func = <<'EOF'; $build_func = <<'EOF';
build() { build() {
cd "$builddir" cd "$builddir"
export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
PERL_MM_USE_DEFAULT=1 perl -I. Makefile.PL INSTALLDIRS=vendor
make make
} }
EOF EOF
@ -243,8 +215,6 @@ check() {
EOF EOF
} }
$text =~ s/^prepare\(\) \{.*?^\}\n/$prepare_func/smg or
die "Can't replace prepare function APKBUILD";
$text =~ s/^build\(\) \{.*?^\}\n/$build_func/smg or $text =~ s/^build\(\) \{.*?^\}\n/$build_func/smg or
die "Can't replace build function APKBUILD"; die "Can't replace build function APKBUILD";
$text =~ s/^package\(\) \{.*?^\}\n/$package_func/smg or $text =~ s/^package\(\) \{.*?^\}\n/$package_func/smg or