Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e7c8732

Browse files
committed
GvR pointed out the correct way to check for statically built modules;
sys.builtin_module_names Add SSL directories in /usr/contrib/ for FreeBSD
1 parent 10b0418 commit e7c8732

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

setup.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,9 @@ def build_extensions(self):
7878
ext.include_dirs.append( '.' ) # to get config.h
7979
ext.include_dirs.append( os.path.join(srcdir, './Include') )
8080

81-
# Try importing a module; if it's already been built statically,
81+
# If a module has already been built statically,
8282
# don't build it here
83-
try:
84-
__import__(ext.name)
85-
except ImportError:
86-
pass # Not built, so this is what we expect
87-
else:
83+
if ext.name in sys.builtin_module_names:
8884
self.extensions.remove(ext)
8985

9086
# When you run "make CC=altcc" or something similar, you really want
@@ -237,10 +233,14 @@ def detect_modules(self):
237233
# socket(2)
238234
# Detect SSL support for the socket module
239235
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
240-
['/usr/local/ssl/include']
236+
['/usr/local/ssl/include',
237+
'/usr/contrib/ssl/include/'
238+
]
241239
)
242240
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
243-
['/usr/local/ssl/lib'] )
241+
['/usr/local/ssl/lib',
242+
'/usr/contrib/ssl/lib/'
243+
] )
244244

245245
if (ssl_incs is not None and
246246
ssl_libs is not None):

0 commit comments

Comments
 (0)