1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GvR pointed out the correct way to check for statically built modules;

Browse Source 
sys.builtin_module_names
Add SSL directories in /usr/contrib/ for FreeBSD
This commit is contained in:
Andrew M. Kuchling 2001-01-19 16:58:21 +00:00
parent 10b04180a0
commit e7c87327b3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
setup.py
View File

@ -78,13 +78,9 @@ class PyBuildExt(build_ext):
ext.include_dirs.append( '.' ) # to get config.h ext.include_dirs.append( '.' ) # to get config.h
ext.include_dirs.append( os.path.join(srcdir, './Include') ) ext.include_dirs.append( os.path.join(srcdir, './Include') )
# Try importing a module; if it's already been built statically, # If a module has already been built statically,
# don't build it here # don't build it here
try: if ext.name in sys.builtin_module_names:
__import__(ext.name)
except ImportError:
pass # Not built, so this is what we expect
else:
self.extensions.remove(ext) self.extensions.remove(ext)
# When you run "make CC=altcc" or something similar, you really want # When you run "make CC=altcc" or something similar, you really want
@ -237,10 +233,14 @@ class PyBuildExt(build_ext):
# socket(2) # socket(2)
# Detect SSL support for the socket module # Detect SSL support for the socket module
ssl_incs = find_file('openssl/ssl.h', inc_dirs, ssl_incs = find_file('openssl/ssl.h', inc_dirs,
['/usr/local/ssl/include'] ['/usr/local/ssl/include',
'/usr/contrib/ssl/include/'
]
) )
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
['/usr/local/ssl/lib'] ) ['/usr/local/ssl/lib',
'/usr/contrib/ssl/lib/'
] )
if (ssl_incs is not None and if (ssl_incs is not None and
ssl_libs is not None): ssl_libs is not None):