Rework building: adapt some scripts

The platform module collection is made in such a way that any Perl
script that wants to take part of the available information can use
them just as well as the build system.

This change adapts test/recipes/90-test_shlibload.t, util/mkdef.pl,
and util/shlib_wrap.sh.in

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7473)

2 files changed, 9 insertions, 17 deletions

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 8f37fbe3ff..83c9d7996d 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -21,6 +21,10 @@ use OpenSSL::Ordinals;
 use lib '.';
 use configdata;
 
+use File::Spec::Functions;
+use lib catdir($config{sourcedir}, 'Configurations');
+use platform;
+
 my $name = undef;               # internal library/module name
 my $ordinals_file = undef;      # the ordinals file to use
 my $version = undef;            # the version to use for the library
@@ -100,7 +104,7 @@ my $apiv = undef;
 $apiv = sprintf "%x%02x%02x", split(/\./, $config{api})
     if $config{api};
 
-my $libname = $unified_info{sharednames}->{$name} // $name;
+my $libname = platform->sharedname($name);
 
 my %OS_data = (
     solaris     => { writer     => \&writer_linux,
diff --git a/util/shlib_wrap.sh.in b/util/shlib_wrap.sh.in
index fc0687d75e..7024cafbd3 100755
--- a/util/shlib_wrap.sh.in
+++ b/util/shlib_wrap.sh.in
@@ -2,20 +2,8 @@
 {-
     use lib '.';
     use configdata;
-
-    sub shlib {
-        my $lib = shift;
-        return "" if $disabled{shared};
-        $lib = $unified_info{rename}->{$lib}
-            if defined $unified_info{rename}->{$lib};
-        $lib = $unified_info{sharednames}->{$lib}
-            . ($target{shlib_variant} || "")
-            . ($target{shared_extension} || ".so");
-        $lib =~ s|\.\$\(SHLIB_VERSION_NUMBER\)
-                 |.$config{shlib_version}|x;
-        return $lib;
-    }
-    "";     # Make sure no left over string sneaks its way into the script
+    use lib catdir($config{sourcedir}, 'Configurations');
+    use platform;
 -}
 # To test this OpenSSL version's applications against another version's
 # shared libraries, simply set
@@ -42,8 +30,8 @@ fi
 THERE="`echo $0 | sed -e 's|[^/]*$||' 2>/dev/null`.."
 [ -d "${THERE}" ] || exec "$@"	# should never happen...
 
-LIBCRYPTOSO="${THERE}/{- shlib('libcrypto') -}"
-LIBSSLSO="${THERE}/{- shlib('libssl') -}"
+LIBCRYPTOSO="${THERE}/{- platform->sharedlib('libcrypto') -}"
+LIBSSLSO="${THERE}/{- platform->sharedlib('libssl') -}"
 
 SYSNAME=`(uname -s) 2>/dev/null`;
 case "$SYSNAME" in