Browse Source

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)
master
Richard Levitte 4 months ago
committed by Matt Caswell
parent
commit
3c121b986c
6 changed files with 9 additions and 6 deletions
  1. +1
    -1
      Configurations/gentemplate.pm
  2. +2
    -1
      Configurations/platform/AIX.pm
  3. +2
    -1
      Configurations/platform/Unix.pm
  4. +2
    -1
      Configurations/platform/Windows.pm
  5. +1
    -1
      util/local_shlib.com.in
  6. +1
    -1
      util/unlocal_shlib.com.in

+ 1
- 1
Configurations/gentemplate.pm View File

@ -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;
}


+ 2
- 1
Configurations/platform/AIX.pm View File

@ -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';
}

+ 2
- 1
Configurations/platform/Unix.pm View File

@ -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.


+ 2
- 1
Configurations/platform/Windows.pm View File

@ -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.


+ 1
- 1
util/local_shlib.com.in View File

@ -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


+ 1
- 1
util/unlocal_shlib.com.in View File

@ -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


Loading…
Cancel
Save