OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Nov-2008 22:05:00
Branch: HEAD Handle: 2008111421045900
Modified files:
openpkg-src/perl-openpkg
perl-openpkg.pl perl-openpkg.spec
Log:
fail on build errors
Summary:
Revision Changes Path
1.23 +12 -6 openpkg-src/perl-openpkg/perl-openpkg.pl
1.38 +1 -1 openpkg-src/perl-openpkg/perl-openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-openpkg/perl-openpkg.pl
============================================================================
$ cvs diff -u -r1.22 -r1.23 perl-openpkg.pl
--- openpkg-src/perl-openpkg/perl-openpkg.pl 9 Apr 2008 10:43:32 -0000
1.22
+++ openpkg-src/perl-openpkg/perl-openpkg.pl 14 Nov 2008 21:04:59 -0000
1.23
@@ -387,14 +387,16 @@
&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 (-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 @@
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 (-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 @@
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";
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-openpkg/perl-openpkg.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 perl-openpkg.spec
--- openpkg-src/perl-openpkg/perl-openpkg.spec 9 Apr 2008 10:43:32
-0000 1.37
+++ openpkg-src/perl-openpkg/perl-openpkg.spec 14 Nov 2008 21:04:59
-0000 1.38
@@ -35,7 +35,7 @@
Group: Perl
License: PD
Version: %{V_perl}
-Release: 20080409
+Release: 20081114
# list of sources
Source0: perl-openpkg.pl
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
