diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-06-16 06:09:41 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-06-16 15:47:39 +0200 |
| commit | 3c121b986c51887c4f6ff662f36b1338fcf53e2a (patch) | |
| tree | 2834492f7bc789a8f54d6921909de1b15833257a | |
| parent | prov: tag SM2 encoders and decoders as non-FIPS (diff) | |
| download | openssl-3c121b986c51887c4f6ff662f36b1338fcf53e2a.tar.xz openssl-3c121b986c51887c4f6ff662f36b1338fcf53e2a.zip | |
Configuration: Fix incorrect $unified_info{attributes} references
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15758)
| -rw-r--r-- | Configurations/gentemplate.pm | 2 | ||||
| -rw-r--r-- | Configurations/platform/AIX.pm | 3 | ||||
| -rw-r--r-- | Configurations/platform/Unix.pm | 3 | ||||
| -rw-r--r-- | Configurations/platform/Windows.pm | 3 | ||||
| -rw-r--r-- | util/local_shlib.com.in | 2 | ||||
| -rw-r--r-- | util/unlocal_shlib.com.in | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/Configurations/gentemplate.pm b/Configurations/gentemplate.pm index 4acc017e3b..a02b19a688 100644 --- a/Configurations/gentemplate.pm +++ b/Configurations/gentemplate.pm @@ -512,7 +512,7 @@ sub doscript { return "" if $cache{$script}; $self->emit('in2script', script => $script, - attrs => $self->{info}->{attributes}->{$script} // {}, + attrs => $self->{info}->{attributes}->{scripts}->{$script} // {}, sources => $self->{info}->{sources}->{$script}); $cache{$script} = 1; } diff --git a/Configurations/platform/AIX.pm b/Configurations/platform/AIX.pm index c6f0e8d251..e2409057cd 100644 --- a/Configurations/platform/AIX.pm +++ b/Configurations/platform/AIX.pm @@ -22,7 +22,8 @@ sub staticname { # Non-installed libraries are *always* static, and their names remain # the same, except for the mandatory extension my $in_libname = platform::BASE->staticname($_[1]); - return $in_libname if $unified_info{attributes}->{$_[1]}->{noinst}; + return $in_libname + if $unified_info{attributes}->{libraries}->{$_[1]}->{noinst}; return platform::BASE->staticname($_[1]) . '_a'; } diff --git a/Configurations/platform/Unix.pm b/Configurations/platform/Unix.pm index 0c03c07930..80963adc30 100644 --- a/Configurations/platform/Unix.pm +++ b/Configurations/platform/Unix.pm @@ -45,7 +45,8 @@ sub staticname { # Non-installed libraries are *always* static, and their names remain # the same, except for the mandatory extension my $in_libname = platform::BASE->staticname($_[1]); - return $in_libname if $unified_info{attributes}->{$_[1]}->{noinst}; + return $in_libname + if $unified_info{attributes}->{libraries}->{$_[1]}->{noinst}; # We currently return the same name anyway... but we might choose to # append '_static' or '_a' some time in the future. diff --git a/Configurations/platform/Windows.pm b/Configurations/platform/Windows.pm index d1932a9200..4ecd6d513d 100644 --- a/Configurations/platform/Windows.pm +++ b/Configurations/platform/Windows.pm @@ -30,7 +30,8 @@ sub staticname { # Non-installed libraries are *always* static, and their names remain # the same, except for the mandatory extension my $in_libname = platform::BASE->staticname($_[1]); - return $in_libname if $unified_info{attributes}->{$_[1]}->{noinst}; + return $in_libname + if $unified_info{attributes}->{libraries}->{$_[1]}->{noinst}; # To make sure not to clash with an import library, we make the static # variant of our installed libraries get '_static' added to their names. diff --git a/util/local_shlib.com.in b/util/local_shlib.com.in index 2e2eaa6dcd..fbb648d770 100644 --- a/util/local_shlib.com.in +++ b/util/local_shlib.com.in @@ -4,7 +4,7 @@ ${- my $bldtop = rel2abs($config{builddir}); our %names = ( map { platform->sharedname($_) => $bldtop.platform->sharedlib($_) } - grep { !$unified_info{attributes}->{$_}->{noinst} } + grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} } @{$unified_info{libraries}} ); "" -} $ ! Create a local environment with the shared library logical names diff --git a/util/unlocal_shlib.com.in b/util/unlocal_shlib.com.in index feade87ef8..17cb489545 100644 --- a/util/unlocal_shlib.com.in +++ b/util/unlocal_shlib.com.in @@ -4,7 +4,7 @@ ${- my $bldtop = rel2abs($config{builddir}); our %names = ( map { platform->sharedname($_) => $bldtop.platform->sharedlib($_) } - grep { !$unified_info{attributes}->{$_}->{noinst} } + grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} } @{$unified_info{libraries}} ); "" -} $ ! Remove the local environment created by local_shlib.com |