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)

diff --git a/Configurations/gentemplate.pm b/Configurations/gentemplate.pm
index 4acc017e3beae2bbfbf3c1f081fc4f082ef854e0..a02b19a688101aeb6a3eb9eaee082d01eff88a99 100644 (file)
--- 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 c6f0e8d25105b0429c80109172200ece95dd8400..e2409057cdf09a130ce9cd11c19aa02d3117473c 100644 (file)
--- 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 0c03c07930cb5f6342289efc0e33eabf56ffffc6..80963adc30d884b48ae19615c6623f7f6e1b4af9 100644 (file)
--- 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 d1932a9200554bd58e3c42e7e5282b2aa1b28e42..4ecd6d513d1a741baad07a0adbaedaaf2f0a1c10 100644 (file)
--- 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 2e2eaa6dcd42a78a76163d1a3a7a6aa19b34101b..fbb648d770337512c5171cc89df57593648de6d3 100644 (file)
--- 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 feade87ef8a5127ac28b78ff45f6e937ec290bb1..17cb489545398cabfef74b7749d80a89e04ae4a2 100644 (file)
--- 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