From: Richard Levitte <levitte@openssl.org>
Date: Mon, 9 Jul 2018 19:07:25 +0000 (+0200)
Subject: Make 'with_fallback' use 'use' instead of 'require'
X-Git-Tag: OpenSSL_1_1_0i~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=546574ba92cae095fd1b4c7366c3b5bde4a58383;p=oweals%2Fopenssl.git

Make 'with_fallback' use 'use' instead of 'require'

This enables us to require module versions, and to fall back to a
bundled version if the system version is too low.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6682)

(cherry picked from commit e9bc5706744213a1a6748dbbcd1b43a6ad4ca09e)
---

diff --git a/util/perl/with_fallback.pm b/util/perl/with_fallback.pm
index 2af1d5fbd5..fc5638ddf0 100644
--- a/util/perl/with_fallback.pm
+++ b/util/perl/with_fallback.pm
@@ -8,15 +8,17 @@
 package with_fallback;
 
 sub import {
+    shift;
+
     use File::Basename;
     use File::Spec::Functions;
     foreach (@_) {
-	eval "require $_";
+	eval "use $_";
 	if ($@) {
 	    unshift @INC, catdir(dirname(__FILE__),
                                  "..", "..", "external", "perl");
 	    my $transfer = "transfer::$_";
-	    eval "require $transfer";
+	    eval "use $transfer";
 	    shift @INC;
 	    warn $@ if $@;
 	}