[Python-checkins] python/dist/src setup.py,1.73.4.10,1.73.4.11

2002年10月09日 17:59:19 -0700

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv21122
Modified Files:
 Tag: release22-maint
	setup.py 
Log Message:
detect_modules(): Be more conservative about adding
runtime_library_dirs (i.e. -R flags) when building the _socket.so
module. Whitelist only the platforms we know need the flags, which
are only sunos (aka Solaris) platforms at the moment. Tested on
RH7.3, OSX 10.2, and Solaris 8.
Forward port candidate for Python 2.3.
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.73.4.10
retrieving revision 1.73.4.11
diff -C2 -d -r1.73.4.10 -r1.73.4.11
*** setup.py	7 Oct 2002 10:38:33 -0000	1.73.4.10
--- setup.py	10 Oct 2002 00:59:16 -0000	1.73.4.11
***************
*** 362,369 ****
 if (ssl_incs is not None and
 ssl_libs is not None):
 exts.append( Extension('_socket', ['socketmodule.c'],
 include_dirs = ssl_incs,
 library_dirs = ssl_libs,
! runtime_library_dirs = ssl_libs,
 libraries = ['ssl', 'crypto'],
 define_macros = [('USE_SSL',1)] ) )
--- 362,372 ----
 if (ssl_incs is not None and
 ssl_libs is not None):
+ rtlibs = None
+ if platform.startswith('sunos'):
+ rtlibs = ssl_libs
 exts.append( Extension('_socket', ['socketmodule.c'],
 include_dirs = ssl_incs,
 library_dirs = ssl_libs,
! runtime_library_dirs = rtlibs,
 libraries = ['ssl', 'crypto'],
 define_macros = [('USE_SSL',1)] ) )