Author: hdu
Date: Fri Jul 5 16:23:07 2013
New Revision: 1500058
URL: http://svn.apache.org/r1500058
Log:
#i122647# prevent symbol preemption of openssl symbols in python libs
Using the "exlude-libs ALL" linker option to prevent symbol preemptions
could be a good idea for all the third-party binaries we are redistibuting
to prevent clashes with system libraries. For now the change is specific
to the openssl symbols imported by our redistributed python libs.
Modified:
openoffice/trunk/main/python/python-solver-before-std.patch
Modified: openoffice/trunk/main/python/python-solver-before-std.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/python/python-solver-before-std.patch?rev=1500058&r1=1500057&r2=1500058&view=diff
==============================================================================
--- openoffice/trunk/main/python/python-solver-before-std.patch (original)
+++ openoffice/trunk/main/python/python-solver-before-std.patch Fri Jul 5
16:23:07 2013
@@ -79,12 +79,19 @@
else:
assert False, "Internal error: Path not found in std_dirs or paths"
-@@ -851,6 +852,8 @@
- have_usable_openssl = (have_any_openssl and
- openssl_ver >= min_openssl_ver)
-
-+ print( "ssl_incs="+str(ssl_incs))
-+ print( "ssl_libs="+str(ssl_libs))
- if have_any_openssl:
- if have_usable_openssl:
- # The _hashlib module wraps optimized implementations
+@@ -819,6 +820,7 @@
+ exts.append( Extension('_ssl', ['_ssl.c'],
+ include_dirs = ssl_incs,
+ library_dirs = ssl_libs,
++ extra_link_args =
['-Wl,--exclude-libs,ALL'],
+ libraries = ['ssl', 'crypto'],
+ depends = ['socketmodule.h']), )
+ else:
+@@ -858,6 +860,7 @@
+ exts.append( Extension('_hashlib', ['_hashopenssl.c'],
+ include_dirs = ssl_incs,
+ library_dirs = ssl_libs,
++ extra_link_args =
['-Wl,--exclude-libs,ALL'],
+ libraries = ['ssl', 'crypto']) )
+ else:
+ print ("warning: openssl 0x%08x is too old for _hashlib" %
