The branch master has been updated via 539ea812c713127bbc487f99760b237781fb871a (commit) from 07f434441e7ea385f975e8df8caa03e62222ca61 (commit)
- Log ----------------------------------------------------------------- commit 539ea812c713127bbc487f99760b237781fb871a Author: Richard Levitte <levi...@openssl.org> Date: Mon Dec 10 19:48:37 2018 +0100 Configuration: $config{shlib_version_number} -> $config{shlib_version} This was forgotten in a few places Fixes #7862 Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7865) ----------------------------------------------------------------------- Summary of changes: Configurations/descrip.mms.tmpl | 4 ++-- Configurations/unix-Makefile.tmpl | 2 +- Configurations/windows-makefile.tmpl | 2 +- util/shlib_wrap.sh.in | 2 +- 4 files changed, 5 insertions(+), 5 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 diff --git a/util/shlib_wrap.sh.in b/util/shlib_wrap.sh.in index eac70ed..fc0687d 100755 --- a/util/shlib_wrap.sh.in +++ b/util/shlib_wrap.sh.in @@ -12,7 +12,7 @@ . ($target{shlib_variant} || "") . ($target{shared_extension} || ".so"); $lib =~ s|\.\$\(SHLIB_VERSION_NUMBER\) - |.$config{shlib_version_number}|x; + |.$config{shlib_version}|x; return $lib; } ""; # Make sure no left over string sneaks its way into the script _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits