Experimental support for import of more options from Configure

[openssl.git] / util / shlib_wrap.sh

diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh
index b3d2a21443a9393a056b81a04e556bf4ecd97fd6..a2f62d696fac44aaaac1647645db304845dc8aed 100755 (executable)
--- a/util/shlib_wrap.sh
+++ b/util/shlib_wrap.sh
@@ -15,25 +15,46 @@ if [ -f "$LIBCRYPTOSO" ]; then
     LIBSSLSO="${THERE}/libssl.so${SOSUFFIX}"
 fi
 
-case "`(uname -s) 2>/dev/null`" in
+SYSNAME=`(uname -s) 2>/dev/null`;
+case "$SYSNAME" in
 SunOS|IRIX*)
        # SunOS and IRIX run-time linkers evaluate alternative
        # variables depending on target ABI...
        rld_var=LD_LIBRARY_PATH
        case "`(/usr/bin/file "$LIBCRYPTOSO") 2>/dev/null`" in
-       *ELF\ 64*SPARC*)
+       *ELF\ 64*SPARC*|*ELF\ 64*AMD64*)
                [ -n "$LD_LIBRARY_PATH_64" ] && rld_var=LD_LIBRARY_PATH_64
+               LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64
+               preload_var=LD_PRELOAD_64
+               ;;
+       # Why are newly built .so's preloaded anyway? Because run-time
+       # .so lookup path embedded into application takes precedence
+       # over LD_LIBRARY_PATH and as result application ends up linking
+       # to previously installed .so's. On IRIX instead of preloading
+       # newly built .so's we trick run-time linker to fail to find
+       # the installed .so by setting _RLD_ROOT variable.
+       *ELF\ 32*MIPS*)
+               #_RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD_LIST
+               _RLD_ROOT=/no/such/dir; export _RLD_ROOT
+               eval $rld_var=\"/usr/lib'${'$rld_var':+:$'$rld_var'}'\"
+               preload_var=_RLD_LIST
                ;;
        *ELF\ N32*MIPS*)
                [ -n "$LD_LIBRARYN32_PATH" ] && rld_var=LD_LIBRARYN32_PATH
-               _RLDN32_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLDN32_LIST
+               #_RLDN32_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLDN32_LIST
+               _RLDN32_ROOT=/no/such/dir; export _RLDN32_ROOT
+               eval $rld_var=\"/usr/lib32'${'$rld_var':+:$'$rld_var'}'\"
+               preload_var=_RLDN32_LIST
                ;;
        *ELF\ 64*MIPS*)
                [ -n "$LD_LIBRARY64_PATH"  ] && rld_var=LD_LIBRARY64_PATH
-               _RLD64_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD64_LIST
+               #_RLD64_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD64_LIST
+               _RLD64_ROOT=/no/such/dir; export _RLD64_ROOT
+               eval $rld_var=\"/usr/lib64'${'$rld_var':+:$'$rld_var'}'\"
+               preload_var=_RLD64_LIST
                ;;
        esac
-       eval $rld_var=\"${THERE}:'$'$rld_var\"; export $rld_var
+       eval $rld_var=\"${THERE}'${'$rld_var':+:$'$rld_var'}'\"; export $rld_var
        unset rld_var
        ;;
 *)     LD_LIBRARY_PATH="${THERE}:$LD_LIBRARY_PATH"     # Linux, ELF HP-UX
@@ -51,16 +72,20 @@ SunOS|IRIX*)
        ;;
 esac
 
-if [ -f "$LIBCRYPTOSO" ]; then
+if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
        # Following three lines are major excuse for isolating them into
        # this wrapper script. Original reason for setting LD_PRELOAD
        # was to make it possible to pass 'make test' when user linked
        # with -rpath pointing to previous version installation. Wrapping
        # it into a script makes it possible to do so on multi-ABI
        # platforms.
-       LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO"         # SunOS, Linux, ELF HP-UX
-       _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"  # Tru64, o32 IRIX
-       export LD_PRELOAD _RLD_LIST
+       case "$SYSNAME" in
+       *BSD)   LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;  # *BSD
+       *)      LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;;  # SunOS, Linux, ELF HP-UX
+       esac
+       _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"      # Tru64, o32 IRIX
+       DYLD_INSERT_LIBRARIES="$LIBCRYPTOSO:$LIBSSLSO"  # MacOS X
+       export LD_PRELOAD _RLD_LIST DYLD_INSERT_LIBRARIES
 fi
 
 exec "$@"