Commit 539ea812 authored by Richard Levitte's avatar Richard Levitte
Browse files

Configuration: $config{shlib_version_number} -> $config{shlib_version} 



This was forgotten in a few places

Fixes #7862

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7865)
parent 07f43444

Configurations/descrip.mms.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -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} -}","',"

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -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/;

Configurations/windows-makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -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

util/shlib_wrap.sh.in

+1 −1
Original line number Diff line number Diff line
@@ -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