diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-10-23 15:42:46 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-01-21 19:31:32 +0100 |
| commit | 9afc2b92fe6725336f9c7d917deb5ca8c5e4011b (patch) | |
| tree | 089fbbacabc0eb6f4ac899cf624304a0feb95ebc /util/shlib_wrap.sh.in | |
| parent | 9dd4ed28eb5972f62723985429b57f42eefda124 (diff) | |
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)
Diffstat (limited to 'util/shlib_wrap.sh.in')
| -rwxr-xr-x | util/shlib_wrap.sh.in | 20 |
1 files changed, 4 insertions, 16 deletions
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 |