From 9afc2b92fe6725336f9c7d917deb5ca8c5e4011b Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Tue, 23 Oct 2018 15:42:46 +0200
Subject: 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)
---
 test/recipes/90-test_shlibload.t | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'test')

diff --git a/test/recipes/90-test_shlibload.t b/test/recipes/90-test_shlibload.t
index ea8aeeb7d5..1f097edaf6 100644
--- a/test/recipes/90-test_shlibload.t
+++ b/test/recipes/90-test_shlibload.t
@@ -6,7 +6,7 @@
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
 
-use OpenSSL::Test qw/:DEFAULT bldtop_dir bldtop_file/;
+use OpenSSL::Test qw/:DEFAULT srctop_dir bldtop_dir/;
 use OpenSSL::Test::Utils;
 use File::Temp qw(tempfile);
 
@@ -15,21 +15,17 @@ use File::Temp qw(tempfile);
 BEGIN {
     setup("test_shlibload");
 }
+use lib srctop_dir('Configurations');
 use lib bldtop_dir('.');
-use configdata;
+use platform;
 
 plan skip_all => "Test only supported in a shared build" if disabled("shared");
 plan skip_all => "Test is disabled on AIX" if config('target') =~ m|^aix|;
 
 plan tests => 10;
 
-# When libssl and libcrypto are compiled on Linux with "-rpath", but not
-# "--enable-new-dtags", the RPATH takes precedence over LD_LIBRARY_PATH,
-# and we end up running with the wrong libraries.  This is resolved by
-# using paths to the shared objects, not just the names.
-
-my $libcrypto = bldtop_file(shlib('libcrypto'));
-my $libssl = bldtop_file(shlib('libssl'));
+my $libcrypto = platform->sharedlib('libcrypto');
+my $libssl = platform->sharedlib('libssl');
 
 (my $fh, my $filename) = tempfile();
 ok(run(test(["shlibloadtest", "-crypto_first", $libcrypto, $libssl, $filename])),
@@ -57,17 +53,6 @@ ok(run(test(["shlibloadtest", "-no_atexit", $libcrypto, $libssl, $filename])),
 ok(!check_atexit($fh));
 unlink $filename;
 
-sub shlib {
-    my $lib = shift;
-    $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}|;
-    return $lib;
-}
-
 sub check_atexit {
     my $fh = shift;
     my $data = <$fh>;
-- 
cgit v1.2.3