diff options
author | Lorenz Kästle <lorenz.kaestle@netways.de> | 2023-04-28 09:00:05 (GMT) |
---|---|---|
committer | Lorenz Kästle <lorenz.kaestle@netways.de> | 2023-04-28 09:00:05 (GMT) |
commit | 34c4d13edd8ece1e928c578974218c10d25600c4 (patch) | |
tree | 96eaf64dc46c8b785d437250d42471180597a699 /tools | |
parent | e4ddeb7bb722b50613108da1cb51a48e84068701 (diff) | |
parent | 7cb82e6486e662fa4d2530523787d3eced266545 (diff) | |
download | monitoring-plugins-34c4d13.tar.gz |
Merge branch 'master' into RincewindsHat-patch-1
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/build_perl_modules | 6 | ||||
-rw-r--r-- | tools/p1.pl | 2 | ||||
-rwxr-xr-x | tools/tinderbox_build | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/build_perl_modules b/tools/build_perl_modules index 5a57a47..b8cd34c 100755 --- a/tools/build_perl_modules +++ b/tools/build_perl_modules | |||
@@ -140,7 +140,7 @@ my $libs = "$destdir/$prefix/lib:$destdir/$prefix/lib/$Config{archname}"; | |||
140 | 140 | ||
141 | my $topdir = cwd(); | 141 | my $topdir = cwd(); |
142 | 142 | ||
143 | # set an initial value if there isnt one already | 143 | # set an initial value if there isn't one already |
144 | # Need to use PERL5LIB to ensure we get pre-installed mods from earlier | 144 | # Need to use PERL5LIB to ensure we get pre-installed mods from earlier |
145 | # tags in the install_order file | 145 | # tags in the install_order file |
146 | $ENV{PERL5LIB} ||= q{}; | 146 | $ENV{PERL5LIB} ||= q{}; |
@@ -149,8 +149,8 @@ $ENV{PERL5LIB} ||= q{}; | |||
149 | $ENV{PERL_AUTOINSTALL} = "--skipdeps"; | 149 | $ENV{PERL_AUTOINSTALL} = "--skipdeps"; |
150 | 150 | ||
151 | # keep a record of how many times a module build is done. This is so they may | 151 | # keep a record of how many times a module build is done. This is so they may |
152 | # be built a second time to include optional prereq's that couldnt | 152 | # be built a second time to include optional prereq's that couldn't |
153 | # previously be built due to circular dependancies | 153 | # previously be built due to circular dependencies |
154 | my %built_modules; | 154 | my %built_modules; |
155 | foreach my $tarball (@tarballs) { | 155 | foreach my $tarball (@tarballs) { |
156 | ( my $dir = $tarball ) =~ s/\.(?:tgz|tar.gz)$//; | 156 | ( my $dir = $tarball ) =~ s/\.(?:tgz|tar.gz)$//; |
diff --git a/tools/p1.pl b/tools/p1.pl index 2788dbf..9cbe6dc 100644 --- a/tools/p1.pl +++ b/tools/p1.pl | |||
@@ -2,7 +2,7 @@ | |||
2 | # | 2 | # |
3 | # Hacked version of the sample code from the perlembedded doco. | 3 | # Hacked version of the sample code from the perlembedded doco. |
4 | # | 4 | # |
5 | # Only major changes are to separate the compiling and cacheing from | 5 | # Only major changes are to separate the compiling and caching from |
6 | # the execution so that the cache can be kept in "non-volatile" parent | 6 | # the execution so that the cache can be kept in "non-volatile" parent |
7 | # process while the execution is done from "volatile" child processes | 7 | # process while the execution is done from "volatile" child processes |
8 | # and that STDOUT is redirected to a file by means of a tied filehandle | 8 | # and that STDOUT is redirected to a file by means of a tied filehandle |
diff --git a/tools/tinderbox_build b/tools/tinderbox_build index 48836b1..1a41f57 100755 --- a/tools/tinderbox_build +++ b/tools/tinderbox_build | |||
@@ -138,7 +138,7 @@ sub BuildIt { | |||
138 | # interprets that as the end of the mail, and truncates the log before | 138 | # interprets that as the end of the mail, and truncates the log before |
139 | # it gets to Tinderbox. (terry weismann, chris yeh) | 139 | # it gets to Tinderbox. (terry weismann, chris yeh) |
140 | # | 140 | # |
141 | # This was replaced by a perl 'port' of the above, writen by | 141 | # This was replaced by a perl 'port' of the above, written by |
142 | # preed@netscape.com; good things: no need for system() call, and now it's | 142 | # preed@netscape.com; good things: no need for system() call, and now it's |
143 | # all in perl, so we don't have to do OS checking like before. | 143 | # all in perl, so we don't have to do OS checking like before. |
144 | 144 | ||