aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorGravatar Holger Weiss <holger@zedat.fu-berlin.de> 2013-08-19 13:30:45 +0200
committerGravatar Holger Weiss <holger@zedat.fu-berlin.de> 2013-08-20 23:47:01 +0200
commitf7bc3a09658b573107ab08a6485c91b201b69f69 (patch)
tree84fd1380a7c05ada2aea816515642e4db7cb961b /tools
parentf4b90cabc0025e14948c03f6ee9e9ccd51c31fb2 (diff)
downloadmonitoring-plugins-f7bc3a09658b573107ab08a6485c91b201b69f69.tar.gz
Update the bundled Params::Validate module
Building the old version fails with recent Perl releases: | Validate.xs: In function `get_type': | Validate.xs:208:5: error: duplicate case value | Validate.xs:205:5: error: previously used here
Diffstat (limited to 'tools')
-rwxr-xr-xtools/build_perl_modules23
1 files changed, 19 insertions, 4 deletions
diff --git a/tools/build_perl_modules b/tools/build_perl_modules
index 4bdb81b1..bcef66fa 100755
--- a/tools/build_perl_modules
+++ b/tools/build_perl_modules
@@ -65,8 +65,15 @@ foreach my $tarball (@tarballs) {
unless (-e $dir) {
system("gunzip -c $tarball | tar -xf -") == 0 or die "Cannot extract $tarball";
chdir $dir or die "Can't chdir into $dir";
- system("perl Makefile.PL PREFIX=$destdir INSTALLDIRS=site LIB=$destdir/lib") == 0 or die "Can't run perl Makefile.PL";
- system("make") == 0 or die "Can't run make";
+ if (-e "Makefile.PL") {
+ system("perl Makefile.PL PREFIX=$destdir INSTALLDIRS=site LIB=$destdir/lib") == 0
+ or die "Can't run perl Makefile.PL";
+ system("make") == 0 or die "Can't run make";
+ } else {
+ system("perl Build.PL --prefix $destdir --installdirs site --install_path lib=$destdir/lib") == 0
+ or die "Can't run perl Build.PL";
+ system("./Build.PL") == 0 or die "Can't run ./Build";
+ }
chdir $topdir or die "Can't chdir to top";;
}
}
@@ -79,10 +86,18 @@ foreach my $tarball (@tarballs) {
$ENV{PERL5LIB}=join(":", @dirs);
if ($opts->{t}) {
- system("make test") == 0 or die "Can't run make test failed";
+ if (-e "Makefile") {
+ system("make test") == 0 or die "Can't run make test failed";
+ } else {
+ system("./Build test") == 0 or die "./Build test failed";
+ }
}
if ($opts->{i}) {
- system("make install SITEPREFIX=$destdir") == 0 or die "Can't run make install";
+ if (-e "Makefile") {
+ system("make install SITEPREFIX=$destdir") == 0 or die "Can't run make install";
+ } else {
+ system("./Build install") == 0 or die "Can't run ./Build install";
+ }
}
chdir $topdir or die "Can't go back to $topdir";
}