diff options
author | Holger Weiss <holger@zedat.fu-berlin.de> | 2013-08-19 13:30:45 +0200 |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2013-08-20 23:47:01 +0200 |
commit | f7bc3a09658b573107ab08a6485c91b201b69f69 (patch) | |
tree | 84fd1380a7c05ada2aea816515642e4db7cb961b /tools/build_perl_modules | |
parent | f4b90cabc0025e14948c03f6ee9e9ccd51c31fb2 (diff) | |
download | monitoring-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/build_perl_modules')
-rwxr-xr-x | tools/build_perl_modules | 23 |
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) { | |||
65 | unless (-e $dir) { | 65 | unless (-e $dir) { |
66 | system("gunzip -c $tarball | tar -xf -") == 0 or die "Cannot extract $tarball"; | 66 | system("gunzip -c $tarball | tar -xf -") == 0 or die "Cannot extract $tarball"; |
67 | chdir $dir or die "Can't chdir into $dir"; | 67 | chdir $dir or die "Can't chdir into $dir"; |
68 | system("perl Makefile.PL PREFIX=$destdir INSTALLDIRS=site LIB=$destdir/lib") == 0 or die "Can't run perl Makefile.PL"; | 68 | if (-e "Makefile.PL") { |
69 | system("make") == 0 or die "Can't run make"; | 69 | system("perl Makefile.PL PREFIX=$destdir INSTALLDIRS=site LIB=$destdir/lib") == 0 |
70 | or die "Can't run perl Makefile.PL"; | ||
71 | system("make") == 0 or die "Can't run make"; | ||
72 | } else { | ||
73 | system("perl Build.PL --prefix $destdir --installdirs site --install_path lib=$destdir/lib") == 0 | ||
74 | or die "Can't run perl Build.PL"; | ||
75 | system("./Build.PL") == 0 or die "Can't run ./Build"; | ||
76 | } | ||
70 | chdir $topdir or die "Can't chdir to top";; | 77 | chdir $topdir or die "Can't chdir to top";; |
71 | } | 78 | } |
72 | } | 79 | } |
@@ -79,10 +86,18 @@ foreach my $tarball (@tarballs) { | |||
79 | $ENV{PERL5LIB}=join(":", @dirs); | 86 | $ENV{PERL5LIB}=join(":", @dirs); |
80 | 87 | ||
81 | if ($opts->{t}) { | 88 | if ($opts->{t}) { |
82 | system("make test") == 0 or die "Can't run make test failed"; | 89 | if (-e "Makefile") { |
90 | system("make test") == 0 or die "Can't run make test failed"; | ||
91 | } else { | ||
92 | system("./Build test") == 0 or die "./Build test failed"; | ||
93 | } | ||
83 | } | 94 | } |
84 | if ($opts->{i}) { | 95 | if ($opts->{i}) { |
85 | system("make install SITEPREFIX=$destdir") == 0 or die "Can't run make install"; | 96 | if (-e "Makefile") { |
97 | system("make install SITEPREFIX=$destdir") == 0 or die "Can't run make install"; | ||
98 | } else { | ||
99 | system("./Build install") == 0 or die "Can't run ./Build install"; | ||
100 | } | ||
86 | } | 101 | } |
87 | chdir $topdir or die "Can't go back to $topdir"; | 102 | chdir $topdir or die "Can't go back to $topdir"; |
88 | } | 103 | } |