diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-12-10 19:48:37 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-12-11 10:34:53 +0100 |
| commit | 539ea812c713127bbc487f99760b237781fb871a (patch) | |
| tree | a3a1b748900410779bdd3f8543f4481123eab535 /Configurations | |
| parent | 07f434441e7ea385f975e8df8caa03e62222ca61 (diff) | |
| download | openssl-539ea812c713127bbc487f99760b237781fb871a.zip openssl-539ea812c713127bbc487f99760b237781fb871a.tar.gz openssl-539ea812c713127bbc487f99760b237781fb871a.tar.bz2 | |
Configuration: $config{shlib_version_number} -> $config{shlib_version}
This was forgotten in a few places
Fixes #7862
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7865)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 4 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 5ec2b36..0ef4948 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -10,7 +10,7 @@ our $osslprefix = 'OSSL$'; (our $osslprefix_q = $osslprefix) =~ s/\$/\\\$/; - our $sover_dirname = sprintf "%02d%02d", split(/\./, $config{shlib_version_number}); + our $sover_dirname = sprintf "%02d%02d", split(/\./, $config{shlib_version}); our $osslver = sprintf "%02d%02d", split(/\./, $config{version}); our $sourcedir = $config{sourcedir}; @@ -639,7 +639,7 @@ vmsconfig.pm : configdata.pm WRITE CONFIG "our %config = (" WRITE CONFIG " target => '","{- $config{target} -}","'," WRITE CONFIG " version => '","{- $config{version} -}","'," - WRITE CONFIG " shlib_version_number => '","{- $config{shlib_version_number} -}","'," + WRITE CONFIG " shlib_version => '","{- $config{shlib_version} -}","'," WRITE CONFIG " shlib_major => '","{- $config{shlib_major} -}","'," WRITE CONFIG " shlib_minor => '","{- $config{shlib_minor} -}","'," WRITE CONFIG " no_shared => '","{- $disabled{shared} -}","'," diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index f6ac179..11fecc2 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -21,7 +21,7 @@ # libcrypto.a and use libcrypto_a.a as static one. sub sharedaix { !$disabled{shared} && $config{target} =~ /^aix/ } - our $sover_dirname = $config{shlib_version_number}; + our $sover_dirname = $config{shlib_version}; $sover_dirname =~ s|\.|_|g if $config{target} =~ /^mingw/; diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 21f666f..6f090de 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -13,7 +13,7 @@ our $shlibextimport = $target{shared_import_extension} || ".lib"; our $dsoext = $target{dso_extension} || ".dll"; - (our $sover_dirname = $config{shlib_version_number}) =~ s|\.|_|g; + (our $sover_dirname = $config{shlib_version}) =~ s|\.|_|g; my $build_scheme = $target{build_scheme}; my $install_flavour = $build_scheme->[$#$build_scheme]; # last element |