mirror of
https://github.com/QuasarApp/openssl.git
synced 2025-04-27 18:24:37 +00:00
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)
This commit is contained in:
parent
cb6afcd6ee
commit
8d2214c0a4
@ -17,7 +17,7 @@ use lib "$FindBin::Bin/util/perl";
|
||||
use File::Basename;
|
||||
use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
|
||||
use File::Path qw/mkpath/;
|
||||
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
|
||||
use OpenSSL::Glob;
|
||||
|
||||
# see INSTALL for instructions.
|
||||
|
||||
|
@ -461,7 +461,7 @@ ENDIF
|
||||
{-
|
||||
use File::Spec::Functions;
|
||||
use File::Basename;
|
||||
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
|
||||
use OpenSSL::Glob;
|
||||
|
||||
my @nogo_headers = ( "asn1_mac.h",
|
||||
"__decc_include_prologue.h",
|
||||
|
@ -11,7 +11,7 @@ use strict;
|
||||
use warnings;
|
||||
|
||||
use File::Spec;
|
||||
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
|
||||
use OpenSSL::Glob;
|
||||
use OpenSSL::Test qw/:DEFAULT data_file/;
|
||||
use OpenSSL::Test::Utils;
|
||||
|
||||
|
@ -13,7 +13,7 @@ use warnings;
|
||||
use File::Spec::Functions;
|
||||
use File::Copy;
|
||||
use File::Basename;
|
||||
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
|
||||
use OpenSSL::Glob;
|
||||
use OpenSSL::Test qw/:DEFAULT srctop_file/;
|
||||
|
||||
setup("test_rehash");
|
||||
|
@ -12,8 +12,7 @@ use warnings;
|
||||
|
||||
use File::Basename;
|
||||
use File::Compare qw/compare_text/;
|
||||
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
|
||||
|
||||
use OpenSSL::Glob;
|
||||
use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file/;
|
||||
use OpenSSL::Test::Utils qw/disabled alldisabled available_protocols/;
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
|
||||
use OpenSSL::Glob;
|
||||
use OpenSSL::Test qw/:DEFAULT srctop_file/;
|
||||
use OpenSSL::Test::Utils;
|
||||
|
||||
|
@ -16,7 +16,9 @@ BEGIN {
|
||||
|
||||
use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/;
|
||||
use File::Basename;
|
||||
use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
|
||||
use FindBin;
|
||||
use lib "$FindBin::Bin/../util/perl";
|
||||
use OpenSSL::Glob;
|
||||
use Module::Load::Conditional qw(can_load);
|
||||
|
||||
my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef })
|
||||
|
@ -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;
|
||||
|
||||
|
21
util/perl/OpenSSL/Glob.pm
Normal file
21
util/perl/OpenSSL/Glob.pm
Normal file
@ -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__
|
@ -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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user