Skip to content

bpo-45573: Detect stdlib extension modules in configure #29534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tiran wants to merge 8 commits into from
Closed

bpo-45573: Detect stdlib extension modules in configure #29534

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
207617e
bpo-45573: Detect stdlib extension modules in configure
tiran Nov 4, 2021
bcf8469
Generate MODULE_BLOCK automatically
tiran Nov 12, 2021
7b0d162
Generate block for simple and static modules
tiran Nov 12, 2021
513ff43
Split enabled/supported flags
tiran Nov 14, 2021
836eb43
Use CFLAGS, LDFLAGS, and DEPS from Makefile
tiran Nov 14, 2021
c4311ad
Comment out some modules that are not ported yet
tiran Nov 15, 2021
61f31c1
Simplify setup.py even more
tiran Nov 15, 2021
d8ab7c8
Add Setup.stdlib
tiran Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify setup.py even more
  • Loading branch information
@tiran
tiran committed Nov 15, 2021
commit 61f31c17dc327a12ddb35430e9daa78653f5f5fc
144 changes: 35 additions & 109 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,12 @@ def add(self, ext, *, update_flags=True):
self.disabled_configure.append(ext.name)
elif state == "missing":
self.missing.append(ext.name)
# state in {"n/a", None}
elif state == "n/a":
# not available on current platform
pass
else:
# not migrated yet.
self.extensions.append(ext)

def set_srcdir(self):
self.srcdir = sysconfig.get_config_var('srcdir')
Expand Down Expand Up @@ -458,12 +463,11 @@ def update_extension_flags(self, ext):
Reads MODULE_{name}_CFLAGS and _LDFLAGS

Distutils appends extra args to the compiler arguments. Some flags like
-I must appear earlier. Otherwise the pre-processor picks up files
-I must appear earlier, otherwise the pre-processor picks up files
from system inclue directories.
"""
upper_name = ext.name.upper()

# Parse compiler flags (-I, -D, -U, extra)
# Parse compiler flags (-I, -D, -U, extra args)
cflags = sysconfig.get_config_var(f"MODULE_{upper_name}_CFLAGS")
if cflags:
for token in shlex.split(cflags):
Expand All @@ -481,7 +485,7 @@ def update_extension_flags(self, ext):
else:
ext.extra_compile_args.append(token)

# Parse linker flags (-L, -l, extra)
# Parse linker flags (-L, -l, extra objects, extra args)
ldflags = sysconfig.get_config_var(f"MODULE_{upper_name}_LDFLAGS")
if ldflags:
for token in shlex.split(ldflags):
Expand All @@ -491,6 +495,11 @@ def update_extension_flags(self, ext):
ext.library_dirs.append(value)
elif switch == '-l':
ext.libraries.append(value)
elif (
not token.startswith('-') and
token.endswith(('.a', '.o', '.so', '.sl', '.dylib'))
):
ext.extra_objects.append(token)
else:
ext.extra_link_args.append(token)

Expand Down Expand Up @@ -1047,16 +1056,9 @@ def detect_simple_extensions(self):
# pwd(3)
self.add(Extension('pwd', ['pwdmodule.c']))
# grp(3)
if not VXWORKS:
self.add(Extension('grp', ['grpmodule.c']))
self.add(Extension('grp', ['grpmodule.c']))
# spwd, shadow passwords
if (self.config_h_vars.get('HAVE_GETSPNAM', False) or
self.config_h_vars.get('HAVE_GETSPENT', False)):
self.add(Extension('spwd', ['spwdmodule.c']))
# AIX has shadow passwords, but access is not via getspent(), etc.
# module support is not expected so it not 'missing'
elif not AIX:
self.missing.append('spwd')
self.add(Extension('spwd', ['spwdmodule.c']))

# select(2); not on ancient System V
self.add(Extension('select', ['selectmodule.c']))
Expand Down Expand Up @@ -1465,62 +1467,28 @@ def detect_sqlite(self):
self.missing.append('_sqlite3')

def detect_platform_specific_exts(self):
# Unix-only modules
if not MS_WINDOWS:
if not VXWORKS:
# Steen Lumholt's termios module
self.add(Extension('termios', ['termios.c']))
# Jeremy Hylton's rlimit interface
self.add(Extension('resource', ['resource.c']))
else:
self.missing.extend(['resource', 'termios'])

# Platform-specific libraries
if HOST_PLATFORM.startswith(('linux', 'freebsd', 'gnukfreebsd')):
self.add(Extension('ossaudiodev', ['ossaudiodev.c']))
elif not AIX:
self.missing.append('ossaudiodev')

if MACOS:
self.add(Extension('_scproxy', ['_scproxy.c'],
extra_link_args=[
'-framework', 'SystemConfiguration',
'-framework', 'CoreFoundation']))
# Steen Lumholt's termios module
self.add(Extension('termios', ['termios.c']))
# Jeremy Hylton's rlimit interface
self.add(Extension('resource', ['resource.c']))
# needs sys/soundcard.h
self.add(Extension('ossaudiodev', ['ossaudiodev.c']))
# macOS-only
self.add(Extension('_scproxy', ['_scproxy.c']))

def detect_compress_exts(self):
# Andrew Kuchling's zlib module.
have_zlib = sysconfig.get_config_var("HAVE_LIBZ")
if have_zlib:
self.add(Extension('zlib', ['zlibmodule.c'],
libraries=['z']))
else:
self.missing.append('zlib')
self.add(Extension('zlib', ['zlibmodule.c']))

# Helper module for various ascii-encoders. Uses zlib for an optimized
# crc32 if we have it. Otherwise binascii uses its own.
if have_zlib:
define_macros = [('USE_ZLIB_CRC32', None)]
libraries = ['z']
else:
define_macros = None
libraries = []
self.add(Extension('binascii', ['binascii.c'],
define_macros=define_macros,
libraries=libraries))
self.add(Extension('binascii', ['binascii.c']))

# Gustavo Niemeyer's bz2 module.
if sysconfig.get_config_var("HAVE_LIBBZ2"):
self.add(Extension('_bz2', ['_bz2module.c'],
libraries=['bz2']))
else:
self.missing.append('_bz2')
self.add(Extension('_bz2', ['_bz2module.c']))

# LZMA compression support.
if sysconfig.get_config_var("HAVE_LIBLZMA"):
self.add(Extension('_lzma', ['_lzmamodule.c'],
libraries=['lzma']))
else:
self.missing.append('_lzma')
self.add(Extension('_lzma', ['_lzmamodule.c']))

def detect_expat_elementtree(self):
# Interface to the Expat XML parser
Expand All @@ -1534,20 +1502,13 @@ def detect_expat_elementtree(self):
#
# More information on Expat can be found at www.libexpat.org.
#
expat_depends = []
libexpat_a = sysconfig.get_config_var("LIBEXPAT_A")
if libexpat_a:
expat_depends.append(libexpat_a)

self.add(Extension('pyexpat',
sources=['pyexpat.c'],
depends=expat_depends))
sources=['pyexpat.c']))

# Fredrik Lundh's cElementTree module. Note that this also
# uses expat (via the CAPI hook in pyexpat).
self.add(Extension('_elementtree',
sources=['_elementtree.c'],
depends=['pyexpat.c', *expat_depends]))
sources=['_elementtree.c']))

def detect_multibytecodecs(self):
# Hye-Shik Chang's CJKCodecs modules.
Expand All @@ -1570,42 +1531,18 @@ def detect_multiprocessing(self):
self.add(Extension('_multiprocessing', multiprocessing_srcs,
include_dirs=["Modules/_multiprocessing"]))

if (not MS_WINDOWS and
sysconfig.get_config_var('HAVE_SHM_OPEN') and
sysconfig.get_config_var('HAVE_SHM_UNLINK')):
posixshmem_srcs = ['_multiprocessing/posixshmem.c']
libs = []
if sysconfig.get_config_var('SHM_NEEDS_LIBRT'):
# need to link with librt to get shm_open()
libs.append('rt')
self.add(Extension('_posixshmem', posixshmem_srcs,
define_macros={},
libraries=libs,
include_dirs=["Modules/_multiprocessing"]))
else:
self.missing.append('_posixshmem')
self.add(Extension('_posixshmem', ['_multiprocessing/posixshmem.c']))

def detect_uuid(self):
# Build the _uuid module if possible
uuid_h = sysconfig.get_config_var("HAVE_UUID_H")
uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H")
if uuid_h or uuid_uuid_h:
if sysconfig.get_config_var("HAVE_LIBUUID"):
uuid_libs = ["uuid"]
else:
uuid_libs = []
self.add(Extension('_uuid', ['_uuidmodule.c'],
libraries=uuid_libs))
else:
self.missing.append('_uuid')
self.add(Extension('_uuid', ['_uuidmodule.c']))

def detect_modules(self):
self.configure_compiler()
self.init_inc_lib_dirs()

self.detect_simple_extensions()
if TEST_EXTENSIONS:
self.detect_test_extensions()
self.detect_test_extensions()
self.detect_readline_curses()
self.detect_crypt()
self.detect_socket()
Expand Down Expand Up @@ -1984,11 +1921,8 @@ def detect_ctypes(self):
libraries=[],
sources=sources)
self.add(ext)
if TEST_EXTENSIONS:
# function my_sqrt() needs libm for sqrt()
self.add(Extension('_ctypes_test',
sources=['_ctypes/_ctypes_test.c'],
libraries=['m']))
self.add(Extension('_ctypes_test',
sources=['_ctypes/_ctypes_test.c']))

ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR")
ffi_lib = None
Expand Down Expand Up @@ -2074,14 +2008,6 @@ def split_var(name, sep):
self.missing.extend(['_ssl', '_hashlib'])
return None, None

# Find OpenSSL includes
ssl_incs = find_file(
'openssl/ssl.h', self.inc_dirs, openssl_includes
)
if ssl_incs is None:
self.missing.extend(['_ssl', '_hashlib'])
return None, None

if openssl_rpath == 'auto':
runtime_library_dirs = openssl_libdirs[:]
elif not openssl_rpath:
Expand Down