From: Richard Levitte <levitte@openssl.org>
Date: Tue, 1 Jun 2021 05:45:54 +0000 (+0200)
Subject: Configure: variable expand GENERATE values too
X-Git-Tag: openssl-3.0.0-beta1~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7058b4db821efa87e40dab584059b85ca676bc21;p=thirdparty%2Fopenssl.git

Configure: variable expand GENERATE values too

Internal documentation doesn't allow for any exception...  Therefore,
even GENERATE values should be variable expanded.

(there are historical reasons why GENERATE was excepted from variable
expansion, that aren't applicable any more)

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/15554)
---

diff --git a/Configure b/Configure
index 3a9ef03a6e9..f6951bbb188 100755
--- a/Configure
+++ b/Configure
@@ -2212,7 +2212,7 @@ if ($builder eq "unified") {
                          if !@skip || $skip[$#skip] > 0; },
             qr/^\s* GENERATE ${index_re} = ${value_re} $/x
             => sub { $push_to->(\%generate, $expand_variables->($+{INDEX}),
-                                undef, undef, $+{VALUE})
+                                undef, undef, $expand_variables->($+{VALUE}))
                          if !@skip || $skip[$#skip] > 0; },
             qr/^\s* (?:\#.*)? $/x => sub { },
             "OTHERWISE" => sub { die "Something wrong with this line:\n$_\nat $sourced/$f" },