diff options
author | Richard Levitte <levitte@openssl.org> | 2017-08-01 22:43:56 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-08-15 11:31:18 +0200 |
commit | 8d2214c0a49584044d96b80e846ac8f6df35a0ad (patch) | |
tree | cfad073ef328f3983cece8b214a230a3819b6388 /util | |
parent | cb6afcd6ee0c0d66fae62e13fe5966171992f81c (diff) |
File::Glob option ':bsd_glob' doesn't work everywhere, replace w/ a wrapper
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4069)
Diffstat (limited to 'util')
-rwxr-xr-x | util/mkdef.pl | 4 | ||||
-rw-r--r-- | util/perl/OpenSSL/Glob.pm | 21 | ||||
-rw-r--r-- | util/process_docs.pl | 4 |
3 files changed, 27 insertions, 2 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index 7a85e80082..d7baf8aa05 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -49,7 +49,9 @@ use lib "."; use configdata; use File::Spec::Functions; use File::Basename; -use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/; +use FindBin; +use lib "$FindBin::Bin/perl"; +use OpenSSL::Glob; my $debug=0; diff --git a/util/perl/OpenSSL/Glob.pm b/util/perl/OpenSSL/Glob.pm new file mode 100644 index 0000000000..ec87da4aea --- /dev/null +++ b/util/perl/OpenSSL/Glob.pm @@ -0,0 +1,21 @@ +package OpenSSL::Glob; + +use strict; +use warnings; + +use File::Glob; + +use Exporter; +use vars qw($VERSION @ISA @EXPORT); + +$VERSION = '0.1'; +@ISA = qw(Exporter); +@EXPORT = qw(glob); + +sub glob { + goto &File::Glob::bsd_glob if $^O ne "VMS"; + goto &CORE::glob; +} + +1; +__END__ diff --git a/util/process_docs.pl b/util/process_docs.pl index 49176ad30b..2b7f3227d3 100644 --- a/util/process_docs.pl +++ b/util/process_docs.pl @@ -13,7 +13,9 @@ use File::Spec::Functions; use File::Basename; use File::Copy; use File::Path; -use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/; +use FindBin; +use lib "$FindBin::Bin/perl"; +use OpenSSL::Glob; use Getopt::Long; use Pod::Usage; |