The branch master has been updated
via a772e9d01a81dae132cb03107292b3ecc725e5af (commit)
via 86e75432835ec3ef7700a7103f9847e3c3d4350d (commit)
from 30752dd7df7c699b380043cb73e384dd84cab539 (commit)
- Log -----------------------------------------------------------------
commit a772e9d01a81dae132cb03107292b3ecc725e5af
Author: Richard Levitte <[email protected]>
Date: Wed Mar 9 11:36:32 2016 +0100
Touch the correct variables for the system; shlib_wrap.sh on Solaris
If there is cause to think LD_LIBRARY_PATH_32 and LD_PRELOAD_32 are
appropriate variables to touch, do so. Otherwise, touch the usual
LD_LIBRARY_PATH and LD_PRELOAD. This covers for older installations
that don't have a mix of 32-bit and 64-bit libs.
Reviewed-by: Andy Polyakov <[email protected]>
commit 86e75432835ec3ef7700a7103f9847e3c3d4350d
Author: Richard Levitte <[email protected]>
Date: Sun Mar 6 22:36:57 2016 +0100
Recognise 32-bit Solaris in util/shlib_wrap.sh
Submitted by Erik Forsberg <[email protected]>
Reviewed-by: Andy Polyakov <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
util/shlib_wrap.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/util/shlib_wrap.sh b/util/shlib_wrap.sh
index 646b0fe..ce463f1 100755
--- a/util/shlib_wrap.sh
+++ b/util/shlib_wrap.sh
@@ -27,6 +27,15 @@ SunOS|IRIX*)
LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64
preload_var=LD_PRELOAD_64
;;
+ *ELF\ 32*SPARC*|*ELF\ 32*80386*)
+ # We only need to change LD_PRELOAD_32 and LD_LIBRARY_PATH_32
+ # on a multi-arch system. Otherwise, trust the fallbacks.
+ if [ -f /lib/64/ld.so.1 ]; then
+ [ -n "$LD_LIBRARY_PATH_32" ] && rld_var=LD_LIBRARY_PATH_32
+ LD_PRELOAD_32="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_32
+ preload_var=LD_PRELOAD_32
+ fi
+ ;;
# 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
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
