X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=util%2Fshlib_wrap.sh.in;h=7024cafbd361495f6a59bc3ec863fb7fa30bf0f2;hb=b0d5c1cb0773588dca69875e122fac75252ccdf6;hp=fc0687d75e8c1e2602950efd39c9f503980d449f;hpb=539ea812c713127bbc487f99760b237781fb871a;p=openssl.git 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