diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-06-10 09:15:58 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-06-11 15:45:06 +0200 |
| commit | 4a73938756566e06f101c1c599b5472b06a8e0c0 (patch) | |
| tree | 8f647fd31b62080b1adfc287947be1c3bb11fb73 /Configure | |
| parent | 8ccbf00d1786f25af5e64a2354f87aef31b57bdf (diff) | |
| download | openssl-new-4a73938756566e06f101c1c599b5472b06a8e0c0.tar.gz | |
Configure: Allow spaces around '=' in all build.info statements
This was allowed already for some statements, but not consistently for all.
Fixes #15684
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15691)
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -2108,7 +2108,7 @@ if ($builder eq "unified") { my $index_re = qr/\[\s*(?P<INDEX>(?:\\.|.)*?)\s*\]/; my $cond_re = qr/\[\s*(?P<COND>(?:\\.|.)*?)\s*\]/; my $attribs_re = qr/(?:\{\s*(?P<ATTRIBS>(?:\\.|.)*?)\s*\})?/; - my $value_re = qr/\s*(?P<VALUE>.*?)\s*/; + my $value_re = qr/(?P<VALUE>.*?)/; collect_information( collect_from_array([ @text ], qr/\\$/ => sub { my $l1 = shift; my $l2 = shift; @@ -2135,13 +2135,13 @@ if ($builder eq "unified") { qr/^\s* ENDIF \s*$/x => sub { die "ENDIF out of scope" if ! @skip; pop @skip; }, - qr/^\s* ${variable_re} \s* = ${value_re} $/x + qr/^\s* ${variable_re} \s* = \s* ${value_re} \s* $/x => sub { if (!@skip || $skip[$#skip] > 0) { $variables{$+{VARIABLE}} = $expand_variables->($+{VALUE}); } }, - qr/^\s* SUBDIRS \s* = ${value_re} $/x + qr/^\s* SUBDIRS \s* = \s* ${value_re} \s* $/x => sub { if (!@skip || $skip[$#skip] > 0) { foreach (tokenize($expand_variables->($+{VALUE}))) { @@ -2149,67 +2149,67 @@ if ($builder eq "unified") { } } }, - qr/^\s* PROGRAMS ${attribs_re} \s* = ${value_re} $/x + qr/^\s* PROGRAMS ${attribs_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\@programs, undef, \$attributes{programs}, $+{ATTRIBS}, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* LIBS ${attribs_re} \s* = ${value_re} $/x + qr/^\s* LIBS ${attribs_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\@libraries, undef, \$attributes{libraries}, $+{ATTRIBS}, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* MODULES ${attribs_re} \s* = ${value_re} $/x + qr/^\s* MODULES ${attribs_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\@modules, undef, \$attributes{modules}, $+{ATTRIBS}, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* SCRIPTS ${attribs_re} \s* = ${value_re} $/x + qr/^\s* SCRIPTS ${attribs_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\@scripts, undef, \$attributes{scripts}, $+{ATTRIBS}, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* IMAGEDOCS ${index_re} = ${value_re} $/x + qr/^\s* IMAGEDOCS ${index_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\%imagedocs, $expand_variables->($+{INDEX}), undef, undef, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* HTMLDOCS ${index_re} = ${value_re} $/x + qr/^\s* HTMLDOCS ${index_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\%htmldocs, $expand_variables->($+{INDEX}), undef, undef, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* MANDOCS ${index_re} = ${value_re} $/x + qr/^\s* MANDOCS ${index_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\%mandocs, $expand_variables->($+{INDEX}), undef, undef, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* SOURCE ${index_re} ${attribs_re} = ${value_re} $/x + qr/^\s* SOURCE ${index_re} ${attribs_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\%sources, $expand_variables->($+{INDEX}), \$attributes{sources}, $+{ATTRIBS}, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* SHARED_SOURCE ${index_re} ${attribs_re} = ${value_re} $/x + qr/^\s* SHARED_SOURCE ${index_re} ${attribs_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\%shared_sources, $expand_variables->($+{INDEX}), \$attributes{sources}, $+{ATTRIBS}, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* INCLUDE ${index_re} = ${value_re} $/x + qr/^\s* INCLUDE ${index_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\%includes, $expand_variables->($+{INDEX}), undef, undef, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* DEFINE ${index_re} = ${value_re} $/x + qr/^\s* DEFINE ${index_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\%defines, $expand_variables->($+{INDEX}), undef, undef, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* DEPEND ${index_re} ${attribs_re} = ${value_re} $/x + qr/^\s* DEPEND ${index_re} ${attribs_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\%depends, $expand_variables->($+{INDEX}), \$attributes{depends}, $+{ATTRIBS}, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, - qr/^\s* GENERATE ${index_re} = ${value_re} $/x + qr/^\s* GENERATE ${index_re} \s* = \s* ${value_re} \s* $/x => sub { $push_to->(\%generate, $expand_variables->($+{INDEX}), undef, undef, $expand_variables->($+{VALUE})) if !@skip || $skip[$#skip] > 0; }, |