From 9afc2b92fe6725336f9c7d917deb5ca8c5e4011b Mon Sep 17 00:00:00 2001 From: Richard Levitte 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 Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/7473) --- util/mkdef.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'util/mkdef.pl') 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, -- cgit v1.2.3