|
|
@@ -387,14 +387,16 @@ if (grep { $_ eq "configure" } @steps_run) {
|
|
|
&runcmd("chmod u+rw Build.PL");
|
|
|
&runcmd("cp Build.PL Build.PL.orig");
|
|
|
&runcmd("(cat Build.PL.orig; echo '') | sed -e \"s:\\\$^X:'$perlwrap':g\" >Build.PL");
|
|
|
- &runcmd("$perlwrap ./Build.PL $perl_args");
|
|
|
+ &runcmd("$perlwrap ./Build.PL $perl_args")
|
|
|
+ or die "failed to \"configure\"";
|
|
|
}
|
|
|
elsif ($environment eq 'ExtUtils::MakeMaker') {
|
|
|
&verbose("configuring module via ExtUtils::MakeMaker environment");
|
|
|
&runcmd("chmod u+rw Makefile.PL");
|
|
|
&runcmd("cp Makefile.PL Makefile.PL.orig");
|
|
|
&runcmd("(cat Makefile.PL.orig; echo '') | sed -e \"s:\\\$^X:'$perlwrap':g\" >Makefile.PL");
|
|
|
- &runcmd("$perlwrap ./Makefile.PL $perl_args");
|
|
|
+ &runcmd("$perlwrap ./Makefile.PL $perl_args")
|
|
|
+ or die "failed to \"configure\"";
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -405,7 +407,8 @@ if (grep { $_ eq "build" } @steps_run) {
|
|
|
if (-f "Build.PL" and -f "Build") {
|
|
|
# execute Build script
|
|
|
&verbose("building module via Module::Build environment");
|
|
|
- &runcmd("$perlwrap Build build");
|
|
|
+ &runcmd("$perlwrap Build build")
|
|
|
+ or die "failed to \"build\"";
|
|
|
}
|
|
|
elsif (-f "Makefile.PL" and -f "Makefile") {
|
|
|
# execute Makefile procedure
|
|
|
@@ -413,7 +416,8 @@ if (grep { $_ eq "build" } @steps_run) {
|
|
|
my $make = `$CF->{prog_rpm} --eval '\%{l_make} \%{l_mflags}'`;
|
|
|
$make =~ s|\n+$||s;
|
|
|
my $make_args = "PERL=$perlwrap FULLPERL=$perlwrap";
|
|
|
- &runcmd("$make $make_args pure_all");
|
|
|
+ &runcmd("$make $make_args pure_all")
|
|
|
+ or die "failed to \"build\"";
|
|
|
}
|
|
|
else {
|
|
|
die "neither \"Build\" nor \"Makefile\" found in working directory";
|
|
|
@@ -427,7 +431,8 @@ if (grep { $_ eq "install" } @steps_run) {
|
|
|
if (-f "Build.PL" and -f "Build") {
|
|
|
# execute Build script
|
|
|
&verbose("installing module via Module::Build environment");
|
|
|
- &runcmd("$perlwrap Build install");
|
|
|
+ &runcmd("$perlwrap Build install")
|
|
|
+ or die "failed to \"install\"";
|
|
|
&runcmd("rm -rf $CF->{path_buildroot}$CF->{path_prefix}/remove-me-later");
|
|
|
}
|
|
|
elsif (-f "Makefile.PL" and -f "Makefile") {
|
|
|
@@ -436,7 +441,8 @@ if (grep { $_ eq "install" } @steps_run) {
|
|
|
my $make = `$CF->{prog_rpm} --eval '\%{l_make} \%{l_mflags}'`;
|
|
|
$make =~ s|\n+$||s;
|
|
|
my $make_args = "PERL=$perlwrap FULLPERL=$perlwrap";
|
|
|
- &runcmd("$make $make_args pure_install");
|
|
|
+ &runcmd("$make $make_args pure_install")
|
|
|
+ or die "failed to \"install\"";
|
|
|
}
|
|
|
else {
|
|
|
die "neither \"Build\" nor \"Makefile\" found in working directory";
|
