shlib_wrap update [from HEAD].

diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh
index 3866e1851a1c541117418136bc952a6901a5ab5b..a2f62d696fac44aaaac1647645db304845dc8aed 100755 (executable)
--- a/util/shlib_wrap.sh
+++ b/util/shlib_wrap.sh
@@ -27,18 +27,34 @@ SunOS|IRIX*)
                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