[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  61db9961417e74cbd4a285fe482f1f2b30c5536b (commit)
      from  1842f369e5541d8ed9b2716cdd7d516005994733 (commit)


- Log -----------------------------------------------------------------
commit 61db9961417e74cbd4a285fe482f1f2b30c5536b
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Feb 2 09:47:16 2019 +0100

    Build: correct BASE shlib_version_as_filename
    
    This function is designed to use $config{shlib_version} directly
    instead of taking an input argument, yet the BASE variant didn't do
    this.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/8146)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/platform/BASE.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/platform/BASE.pm b/Configurations/platform/BASE.pm
index b7fec11..fcd7b70 100644
--- a/Configurations/platform/BASE.pm
+++ b/Configurations/platform/BASE.pm
@@ -28,8 +28,8 @@ sub sharedname  { return __isshared($_[1]) ? $_[1] : undef } # Name of shared li
 sub staticname  { return __base($_[1], '.a') } # Name of static lib
 
 # Convenience function to convert the shlib version to an acceptable part
-# of a file or directory name.
-sub shlib_version_as_filename { return $_[1] }
+# of a file or directory name.  By default, we consider it acceptable as is.
+sub shlib_version_as_filename { return $config{shlib_version} }
 
 # Convenience functions to convert the possible extension of an input file name
 sub bin         { return $_[0]->binname($_[1]) . $_[0]->binext() }