diff options
| author | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2023-09-17 21:15:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-17 21:15:59 (GMT) |
| commit | d3e07d2b5734149c1314cb98b48dd1adebd62686 (patch) | |
| tree | a924b49927ae1925a7e0893d31e0c9c6abd3228e /tools | |
| parent | 495c4c9adfa482303b31cdac7d28adda82d2d2ed (diff) | |
| parent | 2ddc75e69db5a3dd379c896d8420c9af20ec1cee (diff) | |
| download | monitoring-plugins-d3e07d2b5734149c1314cb98b48dd1adebd62686.tar.gz | |
Merge branch 'master' into dev/check_ssh-patches
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 | ||