diff options
author | Richard Levitte <levitte@openssl.org> | 2019-09-09 11:51:01 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-09-12 12:49:31 +0200 |
commit | 1935a5861c7e4bc1e0a4434800896a2dbd834ae4 (patch) | |
tree | 6419cf2764c32889996d4c20f276c21e5f4b815e /Configure | |
parent | 7eeceeaab24aea16027cdc1f9df92366094893b7 (diff) |
Rework the perl fallback functionality
The module with_fallback.pm was kind of clunky and required a transfer
module. This change replaces if with a much more generic pragma type
module, which simply appends given directories to @INC (as opposed to
the 'lib' pragma, which prepends the directories to @INC).
This also supports having a file MODULES.txt with sub-directories to
modules. This ensures that we don't have to spray individual module
paths throughout our perl code, but can have them collected in one
place.
(do note that there is a 'fallback' module on CPAN. However, it isn't
part of the core perl, and it has no support the any MODULES.txt kind
of construct)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9826)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -17,6 +17,7 @@ use lib "$FindBin::Bin/util/perl"; use File::Basename; use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs splitdir/; use File::Path qw/mkpath/; +use OpenSSL::fallback "$FindBin::Bin/external/perl/MODULES.txt"; use OpenSSL::Glob; # see INSTALL for instructions. @@ -1617,7 +1618,7 @@ my %unified_info = (); my $buildinfo_debug = defined($ENV{CONFIGURE_DEBUG_BUILDINFO}); if ($builder eq "unified") { - use with_fallback qw(Text::Template); + use Text::Template 1.46; sub cleandir { my $base = shift; |