Skip to content

C
cpython
Commit 625dbf25 authored by Victor Stinner's avatar Victor Stinner Committed by GitHub
Browse files
Options

bpo-36146: Refactor setup.py: Add PyBuildExt.srcdir (GH-12124) 

* Add PyBuildExt.srcdir atribute in setup.py: the source directory is
  now always absolute.
* Add PyBuildExt.inc_dirs and PyBuildExt.lib_dirs attributes:
  replace 'inc_dirs' and 'lib_dirs' local variables of
  detect_modules().
* Replace "from distutils.errors import *"
  with "from distutils.errors import CCompilerError, DistutilsError"
  to be able to use static analyzers like pyflakes
* Reorder imports.
parent 8058bdae
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 98 deletions
setup.py
View file @ 625dbf25
# Autodetecting setup.py script for building the Python extensions # Autodetecting setup.py script for building the Python extensions
# #
import sys, os, importlib.machinery, re, argparse import argparse
from glob import glob
import importlib._bootstrap import importlib._bootstrap
import importlib.machinery
import importlib.util import importlib.util
import os
import re
import sys
import sysconfig import sysconfig
from glob import glob
from distutils import log from distutils import log
from distutils.errors import *
from distutils.core import Extension, setup
from distutils.command.build_ext import build_ext from distutils.command.build_ext import build_ext
from distutils.command.build_scripts import build_scripts
from distutils.command.install import install from distutils.command.install import install
from distutils.command.install_lib import install_lib from distutils.command.install_lib import install_lib
from distutils.command.build_scripts import build_scripts from distutils.core import Extension, setup
from distutils.errors import CCompilerError, DistutilsError
from distutils.spawn import find_executable from distutils.spawn import find_executable
CROSS_COMPILING = "_PYTHON_HOST_PLATFORM" in os.environ CROSS_COMPILING = "_PYTHON_HOST_PLATFORM" in os.environ
...@@ -227,6 +231,9 @@ class PyBuildExt(build_ext): ...@@ -227,6 +231,9 @@ class PyBuildExt(build_ext):
def __init__(self, dist): def __init__(self, dist):
build_ext.__init__(self, dist) build_ext.__init__(self, dist)
self.srcdir = None
self.lib_dirs = None
self.inc_dirs = None
self.failed = [] self.failed = []
self.failed_on_import = [] self.failed_on_import = []
self.missing = [] self.missing = []
...@@ -237,6 +244,11 @@ class PyBuildExt(build_ext): ...@@ -237,6 +244,11 @@ class PyBuildExt(build_ext):
self.extensions.append(ext) self.extensions.append(ext)
def build_extensions(self): def build_extensions(self):
self.srcdir = sysconfig.get_config_var('srcdir')
if not self.srcdir:
# Maybe running on Windows but not using CYGWIN?
raise ValueError("No source directory; cannot proceed.")
self.srcdir = os.path.abspath(self.srcdir)
# Detect which modules should be compiled # Detect which modules should be compiled
self.detect_modules() self.detect_modules()
...@@ -253,15 +265,10 @@ class PyBuildExt(build_ext): ...@@ -253,15 +265,10 @@ class PyBuildExt(build_ext):
# Fix up the autodetected modules, prefixing all the source files # Fix up the autodetected modules, prefixing all the source files
# with Modules/. # with Modules/.
srcdir = sysconfig.get_config_var('srcdir') moddirlist = [os.path.join(self.srcdir, 'Modules')]
if not srcdir:
# Maybe running on Windows but not using CYGWIN?
raise ValueError("No source directory; cannot proceed.")
srcdir = os.path.abspath(srcdir)
moddirlist = [os.path.join(srcdir, 'Modules')]
# Fix up the paths for scripts, too # Fix up the paths for scripts, too
self.distribution.scripts = [os.path.join(srcdir, filename) self.distribution.scripts = [os.path.join(self.srcdir, filename)
for filename in self.distribution.scripts] for filename in self.distribution.scripts]
# Python header files # Python header files
...@@ -398,7 +405,7 @@ class PyBuildExt(build_ext): ...@@ -398,7 +405,7 @@ class PyBuildExt(build_ext):
build_ext.build_extension(self, ext) build_ext.build_extension(self, ext)
except (CCompilerError, DistutilsError) as why: except (CCompilerError, DistutilsError) as why:
self.announce('WARNING: building of extension "%s" failed: %s' % self.announce('WARNING: building of extension "%s" failed: %s' %
(ext.name, sys.exc_info()[1])) (ext.name, why))
self.failed.append(ext.name) self.failed.append(ext.name)
return return
...@@ -527,8 +534,6 @@ class PyBuildExt(build_ext): ...@@ -527,8 +534,6 @@ class PyBuildExt(build_ext):
is_gcc = False is_gcc = False
is_clang = False is_clang = False
in_incdirs = False in_incdirs = False
inc_dirs = []
lib_dirs = []
try: try:
if ret >> 8 == 0: if ret >> 8 == 0:
with open(tmpfile) as fp: with open(tmpfile) as fp:
...@@ -602,31 +607,29 @@ class PyBuildExt(build_ext): ...@@ -602,31 +607,29 @@ class PyBuildExt(build_ext):
# if a file is found in one of those directories, it can # if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed. # be assumed that no additional -I,-L directives are needed.
if not CROSS_COMPILING: if not CROSS_COMPILING:
lib_dirs = self.compiler.library_dirs + system_lib_dirs self.lib_dirs = self.compiler.library_dirs + system_lib_dirs
inc_dirs = self.compiler.include_dirs + system_include_dirs self.inc_dirs = self.compiler.include_dirs + system_include_dirs
else: else:
# Add the sysroot paths. 'sysroot' is a compiler option used to # Add the sysroot paths. 'sysroot' is a compiler option used to
# set the logical path of the standard system headers and # set the logical path of the standard system headers and
# libraries. # libraries.
lib_dirs = (self.compiler.library_dirs + self.lib_dirs = (self.compiler.library_dirs +
sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs)) sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs))
inc_dirs = (self.compiler.include_dirs + self.inc_dirs = (self.compiler.include_dirs +
sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'), sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'),
system_include_dirs)) system_include_dirs))
config_h = sysconfig.get_config_h_filename() config_h = sysconfig.get_config_h_filename()
with open(config_h) as file: with open(config_h) as file:
config_h_vars = sysconfig.parse_config_h(file) config_h_vars = sysconfig.parse_config_h(file)
srcdir = sysconfig.get_config_var('srcdir')
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if HOST_PLATFORM in ['osf1', 'unixware7', 'openunix8']: if HOST_PLATFORM in ['osf1', 'unixware7', 'openunix8']:
lib_dirs += ['/usr/ccs/lib'] self.lib_dirs += ['/usr/ccs/lib']
# HP-UX11iv3 keeps files in lib/hpux folders. # HP-UX11iv3 keeps files in lib/hpux folders.
if HOST_PLATFORM == 'hp-ux11': if HOST_PLATFORM == 'hp-ux11':
lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
if MACOS: if MACOS:
# This should work on any unixy platform ;-) # This should work on any unixy platform ;-)
...@@ -640,11 +643,11 @@ class PyBuildExt(build_ext): ...@@ -640,11 +643,11 @@ class PyBuildExt(build_ext):
'CFLAGS', 'LDFLAGS') 'CFLAGS', 'LDFLAGS')
for item in cflags.split(): for item in cflags.split():
if item.startswith('-I'): if item.startswith('-I'):
inc_dirs.append(item[2:]) self.inc_dirs.append(item[2:])
for item in ldflags.split(): for item in ldflags.split():
if item.startswith('-L'): if item.startswith('-L'):
lib_dirs.append(item[2:]) self.lib_dirs.append(item[2:])
# #
# The following modules are all pretty straightforward, and compile # The following modules are all pretty straightforward, and compile
...@@ -783,7 +786,7 @@ class PyBuildExt(build_ext): ...@@ -783,7 +786,7 @@ class PyBuildExt(build_ext):
libraries=['m'])) libraries=['m']))
# readline # readline
do_readline = self.compiler.find_library_file(lib_dirs, 'readline') do_readline = self.compiler.find_library_file(self.lib_dirs, 'readline')
readline_termcap_library = "" readline_termcap_library = ""
curses_library = "" curses_library = ""
# Cannot use os.popen here in py3k. # Cannot use os.popen here in py3k.
...@@ -818,11 +821,11 @@ class PyBuildExt(build_ext): ...@@ -818,11 +821,11 @@ class PyBuildExt(build_ext):
# use the same library for the readline and curses modules. # use the same library for the readline and curses modules.
if 'curses' in readline_termcap_library: if 'curses' in readline_termcap_library:
curses_library = readline_termcap_library curses_library = readline_termcap_library
elif self.compiler.find_library_file(lib_dirs, 'ncursesw'): elif self.compiler.find_library_file(self.lib_dirs, 'ncursesw'):
curses_library = 'ncursesw' curses_library = 'ncursesw'
elif self.compiler.find_library_file(lib_dirs, 'ncurses'): elif self.compiler.find_library_file(self.lib_dirs, 'ncurses'):
curses_library = 'ncurses' curses_library = 'ncurses'
elif self.compiler.find_library_file(lib_dirs, 'curses'): elif self.compiler.find_library_file(self.lib_dirs, 'curses'):
curses_library = 'curses' curses_library = 'curses'
if MACOS: if MACOS:
...@@ -836,7 +839,7 @@ class PyBuildExt(build_ext): ...@@ -836,7 +839,7 @@ class PyBuildExt(build_ext):
# MacOSX 10.4 has a broken readline. Don't try to build # MacOSX 10.4 has a broken readline. Don't try to build
# the readline module unless the user has installed a fixed # the readline module unless the user has installed a fixed
# readline package # readline package
if find_file('readline/rlconf.h', inc_dirs, []) is None: if find_file('readline/rlconf.h', self.inc_dirs, []) is None:
do_readline = False do_readline = False
if do_readline: if do_readline:
if MACOS and os_release < 9: if MACOS and os_release < 9:
...@@ -854,7 +857,7 @@ class PyBuildExt(build_ext): ...@@ -854,7 +857,7 @@ class PyBuildExt(build_ext):
pass # Issue 7384: Already linked against curses or tinfo. pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library: elif curses_library:
readline_libs.append(curses_library) readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs + elif self.compiler.find_library_file(self.lib_dirs +
['/usr/lib/termcap'], ['/usr/lib/termcap'],
'termcap'): 'termcap'):
readline_libs.append('termcap') readline_libs.append('termcap')
...@@ -867,7 +870,7 @@ class PyBuildExt(build_ext): ...@@ -867,7 +870,7 @@ class PyBuildExt(build_ext):
# crypt module. # crypt module.
if self.compiler.find_library_file(lib_dirs, 'crypt'): if self.compiler.find_library_file(self.lib_dirs, 'crypt'):
libs = ['crypt'] libs = ['crypt']
else: else:
libs = [] libs = []
...@@ -875,7 +878,7 @@ class PyBuildExt(build_ext): ...@@ -875,7 +878,7 @@ class PyBuildExt(build_ext):
if not VXWORKS: if not VXWORKS:
self.add(Extension('_crypt', ['_cryptmodule.c'], self.add(Extension('_crypt', ['_cryptmodule.c'],
libraries=libs)) libraries=libs))
elif self.compiler.find_library_file(lib_dirs, 'OPENSSL'): elif self.compiler.find_library_file(self.lib_dirs, 'OPENSSL'):
libs = ['OPENSSL'] libs = ['OPENSSL']
self.add(Extension('_crypt', ['_cryptmodule.c'], self.add(Extension('_crypt', ['_cryptmodule.c'],
libraries=libs)) libraries=libs))
...@@ -890,14 +893,14 @@ class PyBuildExt(build_ext): ...@@ -890,14 +893,14 @@ class PyBuildExt(build_ext):
if not VXWORKS: if not VXWORKS:
self.add(Extension('_socket', ['socketmodule.c'], self.add(Extension('_socket', ['socketmodule.c'],
depends=['socketmodule.h'])) depends=['socketmodule.h']))
elif self.compiler.find_library_file(lib_dirs, 'net'): elif self.compiler.find_library_file(self.lib_dirs, 'net'):
libs = ['net'] libs = ['net']
self.add(Extension('_socket', ['socketmodule.c'], self.add(Extension('_socket', ['socketmodule.c'],
depends=['socketmodule.h'], depends=['socketmodule.h'],
libraries=libs)) libraries=libs))
# Detect SSL support for the socket module (via _ssl) # Detect SSL support for the socket module (via _ssl)
self._detect_openssl(inc_dirs, lib_dirs) self._detect_openssl()
# We always compile these even when OpenSSL is available (issue #14693). # We always compile these even when OpenSSL is available (issue #14693).
# It's harmless and the object code is tiny (40-50 KiB per module, # It's harmless and the object code is tiny (40-50 KiB per module,
...@@ -911,7 +914,7 @@ class PyBuildExt(build_ext): ...@@ -911,7 +914,7 @@ class PyBuildExt(build_ext):
self.add(Extension('_sha1', ['sha1module.c'], self.add(Extension('_sha1', ['sha1module.c'],
depends=['hashlib.h'])) depends=['hashlib.h']))
blake2_deps = glob(os.path.join(os.getcwd(), srcdir, blake2_deps = glob(os.path.join(self.srcdir,
'Modules/_blake2/impl/*')) 'Modules/_blake2/impl/*'))
blake2_deps.append('hashlib.h') blake2_deps.append('hashlib.h')
...@@ -921,7 +924,7 @@ class PyBuildExt(build_ext): ...@@ -921,7 +924,7 @@ class PyBuildExt(build_ext):
'_blake2/blake2s_impl.c'], '_blake2/blake2s_impl.c'],
depends=blake2_deps)) depends=blake2_deps))
sha3_deps = glob(os.path.join(os.getcwd(), srcdir, sha3_deps = glob(os.path.join(self.srcdir,
'Modules/_sha3/kcp/*')) 'Modules/_sha3/kcp/*'))
sha3_deps.append('hashlib.h') sha3_deps.append('hashlib.h')
self.add(Extension('_sha3', self.add(Extension('_sha3',
...@@ -1008,7 +1011,7 @@ class PyBuildExt(build_ext): ...@@ -1008,7 +1011,7 @@ class PyBuildExt(build_ext):
# picked up when it is installed in a non-standard prefix and # picked up when it is installed in a non-standard prefix and
# the user has added that prefix into inc_dirs. # the user has added that prefix into inc_dirs.
std_variants = [] std_variants = []
for dn in inc_dirs: for dn in self.inc_dirs:
std_variants.append(os.path.join(dn, 'db3')) std_variants.append(os.path.join(dn, 'db3'))
std_variants.append(os.path.join(dn, 'db4')) std_variants.append(os.path.join(dn, 'db4'))
for x in gen_db_minor_ver_nums(4): for x in gen_db_minor_ver_nums(4):
...@@ -1030,7 +1033,7 @@ class PyBuildExt(build_ext): ...@@ -1030,7 +1033,7 @@ class PyBuildExt(build_ext):
try: try:
# See whether there is a Sleepycat header in the standard # See whether there is a Sleepycat header in the standard
# search path. # search path.
for d in inc_dirs + db_inc_paths: for d in self.inc_dirs + db_inc_paths:
f = os.path.join(d, "db.h") f = os.path.join(d, "db.h")
if MACOS and is_macosx_sdk_path(d): if MACOS and is_macosx_sdk_path(d):
f = os.path.join(sysroot, d[1:], "db.h") f = os.path.join(sysroot, d[1:], "db.h")
...@@ -1108,7 +1111,7 @@ class PyBuildExt(build_ext): ...@@ -1108,7 +1111,7 @@ class PyBuildExt(build_ext):
('db%d%d' % db_ver), ('db%d%d' % db_ver),
('db%d' % db_ver[0])): ('db%d' % db_ver[0])):
dblib_file = self.compiler.find_library_file( dblib_file = self.compiler.find_library_file(
db_dirs_to_check + lib_dirs, dblib ) db_dirs_to_check + self.lib_dirs, dblib )
if dblib_file: if dblib_file:
dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ] dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
raise db_found raise db_found
...@@ -1123,11 +1126,11 @@ class PyBuildExt(build_ext): ...@@ -1123,11 +1126,11 @@ class PyBuildExt(build_ext):
# Only add the found library and include directories if they aren't # Only add the found library and include directories if they aren't
# already being searched. This avoids an explicit runtime library # already being searched. This avoids an explicit runtime library
# dependency. # dependency.
if db_incdir in inc_dirs: if db_incdir in self.inc_dirs:
db_incs = None db_incs = None
else: else:
db_incs = [db_incdir] db_incs = [db_incdir]
if dblib_dir[0] in lib_dirs: if dblib_dir[0] in self.lib_dirs:
dblib_dir = None dblib_dir = None
else: else:
if db_setup_debug: print("db: no appropriate library found") if db_setup_debug: print("db: no appropriate library found")
...@@ -1160,7 +1163,7 @@ class PyBuildExt(build_ext): ...@@ -1160,7 +1163,7 @@ class PyBuildExt(build_ext):
if MACOS: if MACOS:
sysroot = macosx_sdk_root() sysroot = macosx_sdk_root()
for d_ in inc_dirs + sqlite_inc_paths: for d_ in self.inc_dirs + sqlite_inc_paths:
d = d_ d = d_
if MACOS and is_macosx_sdk_path(d): if MACOS and is_macosx_sdk_path(d):
d = os.path.join(sysroot, d[1:]) d = os.path.join(sysroot, d[1:])
...@@ -1197,7 +1200,7 @@ class PyBuildExt(build_ext): ...@@ -1197,7 +1200,7 @@ class PyBuildExt(build_ext):
os.path.join(sqlite_incdir, '..', '..', 'lib'), os.path.join(sqlite_incdir, '..', '..', 'lib'),
] ]
sqlite_libfile = self.compiler.find_library_file( sqlite_libfile = self.compiler.find_library_file(
sqlite_dirs_to_check + lib_dirs, 'sqlite3') sqlite_dirs_to_check + self.lib_dirs, 'sqlite3')
if sqlite_libfile: if sqlite_libfile:
sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))] sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
...@@ -1240,7 +1243,7 @@ class PyBuildExt(build_ext): ...@@ -1240,7 +1243,7 @@ class PyBuildExt(build_ext):
if sqlite_incdir not in self.compiler.include_dirs: if sqlite_incdir not in self.compiler.include_dirs:
include_dirs.append(sqlite_incdir) include_dirs.append(sqlite_incdir)
# avoid a runtime library path for a system library dir # avoid a runtime library path for a system library dir
if sqlite_libdir and sqlite_libdir[0] in lib_dirs: if sqlite_libdir and sqlite_libdir[0] in self.lib_dirs:
sqlite_libdir = None sqlite_libdir = None
self.add(Extension('_sqlite3', sqlite_srcs, self.add(Extension('_sqlite3', sqlite_srcs,
define_macros=sqlite_defines, define_macros=sqlite_defines,
...@@ -1266,13 +1269,13 @@ class PyBuildExt(build_ext): ...@@ -1266,13 +1269,13 @@ class PyBuildExt(build_ext):
dbmext = None dbmext = None
for cand in dbm_order: for cand in dbm_order:
if cand == "ndbm": if cand == "ndbm":
if find_file("ndbm.h", inc_dirs, []) is not None: if find_file("ndbm.h", self.inc_dirs, []) is not None:
# Some systems have -lndbm, others have -lgdbm_compat, # Some systems have -lndbm, others have -lgdbm_compat,
# others don't have either # others don't have either
if self.compiler.find_library_file(lib_dirs, if self.compiler.find_library_file(self.lib_dirs,
'ndbm'): 'ndbm'):
ndbm_libs = ['ndbm'] ndbm_libs = ['ndbm']
elif self.compiler.find_library_file(lib_dirs, elif self.compiler.find_library_file(self.lib_dirs,
'gdbm_compat'): 'gdbm_compat'):
ndbm_libs = ['gdbm_compat'] ndbm_libs = ['gdbm_compat']
else: else:
...@@ -1286,12 +1289,12 @@ class PyBuildExt(build_ext): ...@@ -1286,12 +1289,12 @@ class PyBuildExt(build_ext):
break break
elif cand == "gdbm": elif cand == "gdbm":
if self.compiler.find_library_file(lib_dirs, 'gdbm'): if self.compiler.find_library_file(self.lib_dirs, 'gdbm'):
gdbm_libs = ['gdbm'] gdbm_libs = ['gdbm']
if self.compiler.find_library_file(lib_dirs, if self.compiler.find_library_file(self.lib_dirs,
'gdbm_compat'): 'gdbm_compat'):
gdbm_libs.append('gdbm_compat') gdbm_libs.append('gdbm_compat')
if find_file("gdbm/ndbm.h", inc_dirs, []) is not None: if find_file("gdbm/ndbm.h", self.inc_dirs, []) is not None:
if dbm_setup_debug: print("building dbm using gdbm") if dbm_setup_debug: print("building dbm using gdbm")
dbmext = Extension( dbmext = Extension(
'_dbm', ['_dbmmodule.c'], '_dbm', ['_dbmmodule.c'],
...@@ -1300,7 +1303,7 @@ class PyBuildExt(build_ext): ...@@ -1300,7 +1303,7 @@ class PyBuildExt(build_ext):
], ],
libraries = gdbm_libs) libraries = gdbm_libs)
break break
if find_file("gdbm-ndbm.h", inc_dirs, []) is not None: if find_file("gdbm-ndbm.h", self.inc_dirs, []) is not None:
if dbm_setup_debug: print("building dbm using gdbm") if dbm_setup_debug: print("building dbm using gdbm")
dbmext = Extension( dbmext = Extension(
'_dbm', ['_dbmmodule.c'], '_dbm', ['_dbmmodule.c'],
...@@ -1329,7 +1332,7 @@ class PyBuildExt(build_ext): ...@@ -1329,7 +1332,7 @@ class PyBuildExt(build_ext):
# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
if ('gdbm' in dbm_order and if ('gdbm' in dbm_order and
self.compiler.find_library_file(lib_dirs, 'gdbm')): self.compiler.find_library_file(self.lib_dirs, 'gdbm')):
self.add(Extension('_gdbm', ['_gdbmmodule.c'], self.add(Extension('_gdbm', ['_gdbmmodule.c'],
libraries=['gdbm'])) libraries=['gdbm']))
else: else:
...@@ -1345,7 +1348,7 @@ class PyBuildExt(build_ext): ...@@ -1345,7 +1348,7 @@ class PyBuildExt(build_ext):
else: else:
self.missing.extend(['resource', 'termios']) self.missing.extend(['resource', 'termios'])
self._detect_nis(inc_dirs, lib_dirs) self._detect_nis()
# Curses support, requiring the System V version of curses, often # Curses support, requiring the System V version of curses, often
# provided by the ncurses library. # provided by the ncurses library.
...@@ -1381,9 +1384,9 @@ class PyBuildExt(build_ext): ...@@ -1381,9 +1384,9 @@ class PyBuildExt(build_ext):
elif curses_library == 'curses' and not MACOS: elif curses_library == 'curses' and not MACOS:
# OSX has an old Berkeley curses, not good enough for # OSX has an old Berkeley curses, not good enough for
# the _curses module. # the _curses module.
if (self.compiler.find_library_file(lib_dirs, 'terminfo')): if (self.compiler.find_library_file(self.lib_dirs, 'terminfo')):
curses_libs = ['curses', 'terminfo'] curses_libs = ['curses', 'terminfo']
elif (self.compiler.find_library_file(lib_dirs, 'termcap')): elif (self.compiler.find_library_file(self.lib_dirs, 'termcap')):
curses_libs = ['curses', 'termcap'] curses_libs = ['curses', 'termcap']
else: else:
curses_libs = ['curses'] curses_libs = ['curses']
...@@ -1396,7 +1399,7 @@ class PyBuildExt(build_ext): ...@@ -1396,7 +1399,7 @@ class PyBuildExt(build_ext):
# If the curses module is enabled, check for the panel module # If the curses module is enabled, check for the panel module
if (module_enabled(self.extensions, '_curses') and if (module_enabled(self.extensions, '_curses') and
self.compiler.find_library_file(lib_dirs, panel_library)): self.compiler.find_library_file(self.lib_dirs, panel_library)):
self.add(Extension('_curses_panel', ['_curses_panel.c'], self.add(Extension('_curses_panel', ['_curses_panel.c'],
include_dirs=curses_includes, include_dirs=curses_includes,
define_macros=curses_defines, define_macros=curses_defines,
...@@ -1416,7 +1419,7 @@ class PyBuildExt(build_ext): ...@@ -1416,7 +1419,7 @@ class PyBuildExt(build_ext):
# #
# You can upgrade zlib to version 1.1.4 yourself by going to # You can upgrade zlib to version 1.1.4 yourself by going to
# http://www.gzip.org/zlib/ # http://www.gzip.org/zlib/
zlib_inc = find_file('zlib.h', [], inc_dirs) zlib_inc = find_file('zlib.h', [], self.inc_dirs)
have_zlib = False have_zlib = False
if zlib_inc is not None: if zlib_inc is not None:
zlib_h = zlib_inc[0] + '/zlib.h' zlib_h = zlib_inc[0] + '/zlib.h'
...@@ -1433,7 +1436,7 @@ class PyBuildExt(build_ext): ...@@ -1433,7 +1436,7 @@ class PyBuildExt(build_ext):
version = line.split()[2] version = line.split()[2]
break break
if version >= version_req: if version >= version_req:
if (self.compiler.find_library_file(lib_dirs, 'z')): if (self.compiler.find_library_file(self.lib_dirs, 'z')):
if MACOS: if MACOS:
zlib_extra_link_args = ('-Wl,-search_paths_first',) zlib_extra_link_args = ('-Wl,-search_paths_first',)
else: else:
...@@ -1465,7 +1468,7 @@ class PyBuildExt(build_ext): ...@@ -1465,7 +1468,7 @@ class PyBuildExt(build_ext):
extra_link_args=extra_link_args)) extra_link_args=extra_link_args))
# Gustavo Niemeyer's bz2 module. # Gustavo Niemeyer's bz2 module.
if (self.compiler.find_library_file(lib_dirs, 'bz2')): if (self.compiler.find_library_file(self.lib_dirs, 'bz2')):
if MACOS: if MACOS:
bz2_extra_link_args = ('-Wl,-search_paths_first',) bz2_extra_link_args = ('-Wl,-search_paths_first',)
else: else:
...@@ -1477,7 +1480,7 @@ class PyBuildExt(build_ext): ...@@ -1477,7 +1480,7 @@ class PyBuildExt(build_ext):
self.missing.append('_bz2') self.missing.append('_bz2')
# LZMA compression support. # LZMA compression support.
if self.compiler.find_library_file(lib_dirs, 'lzma'): if self.compiler.find_library_file(self.lib_dirs, 'lzma'):
self.add(Extension('_lzma', ['_lzmamodule.c'], self.add(Extension('_lzma', ['_lzmamodule.c'],
libraries=['lzma'])) libraries=['lzma']))
else: else:
...@@ -1502,7 +1505,7 @@ class PyBuildExt(build_ext): ...@@ -1502,7 +1505,7 @@ class PyBuildExt(build_ext):
expat_sources = [] expat_sources = []
expat_depends = [] expat_depends = []
else: else:
expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')] expat_inc = [os.path.join(self.srcdir, 'Modules', 'expat')]
define_macros = [ define_macros = [
('HAVE_EXPAT_CONFIG_H', '1'), ('HAVE_EXPAT_CONFIG_H', '1'),
# bpo-30947: Python uses best available entropy sources to # bpo-30947: Python uses best available entropy sources to
...@@ -1544,7 +1547,7 @@ class PyBuildExt(build_ext): ...@@ -1544,7 +1547,7 @@ class PyBuildExt(build_ext):
# Fredrik Lundh's cElementTree module. Note that this also # Fredrik Lundh's cElementTree module. Note that this also
# uses expat (via the CAPI hook in pyexpat). # uses expat (via the CAPI hook in pyexpat).
if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')): if os.path.isfile(os.path.join(self.srcdir, 'Modules', '_elementtree.c')):
define_macros.append(('USE_PYEXPAT_CAPI', None)) define_macros.append(('USE_PYEXPAT_CAPI', None))
self.add(Extension('_elementtree', self.add(Extension('_elementtree',
define_macros=define_macros, define_macros=define_macros,
...@@ -1567,7 +1570,7 @@ class PyBuildExt(build_ext): ...@@ -1567,7 +1570,7 @@ class PyBuildExt(build_ext):
self._detect_decimal() self._detect_decimal()
# Thomas Heller's _ctypes module # Thomas Heller's _ctypes module
self.detect_ctypes(inc_dirs, lib_dirs) self.detect_ctypes()
# Richard Oudkerk's multiprocessing module # Richard Oudkerk's multiprocessing module
if MS_WINDOWS: if MS_WINDOWS:
...@@ -1636,15 +1639,15 @@ class PyBuildExt(build_ext): ...@@ -1636,15 +1639,15 @@ class PyBuildExt(build_ext):
'-framework', 'CoreFoundation'])) '-framework', 'CoreFoundation']))
# Call the method for detecting whether _tkinter can be compiled # Call the method for detecting whether _tkinter can be compiled
self.detect_tkinter(inc_dirs, lib_dirs) self.detect_tkinter()
if '_tkinter' not in [e.name for e in self.extensions]: if '_tkinter' not in [e.name for e in self.extensions]:
self.missing.append('_tkinter') self.missing.append('_tkinter')
# Build the _uuid module if possible # Build the _uuid module if possible
uuid_incs = find_file("uuid.h", inc_dirs, ["/usr/include/uuid"]) uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
if uuid_incs is not None: if uuid_incs is not None:
if self.compiler.find_library_file(lib_dirs, 'uuid'): if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
uuid_libs = ['uuid'] uuid_libs = ['uuid']
else: else:
uuid_libs = [] uuid_libs = []
...@@ -1698,7 +1701,7 @@ class PyBuildExt(build_ext): ...@@ -1698,7 +1701,7 @@ class PyBuildExt(build_ext):
self.extensions.append(ext) self.extensions.append(ext)
return True return True
def detect_tkinter_darwin(self, inc_dirs, lib_dirs): def detect_tkinter_darwin(self):
# The _tkinter module, using frameworks. Since frameworks are quite # The _tkinter module, using frameworks. Since frameworks are quite
# different the UNIX search logic is not sharable. # different the UNIX search logic is not sharable.
from os.path import join, exists from os.path import join, exists
...@@ -1787,7 +1790,7 @@ class PyBuildExt(build_ext): ...@@ -1787,7 +1790,7 @@ class PyBuildExt(build_ext):
self.extensions.append(ext) self.extensions.append(ext)
return True return True
def detect_tkinter(self, inc_dirs, lib_dirs): def detect_tkinter(self):
# The _tkinter module. # The _tkinter module.
# Check whether --with-tcltk-includes and --with-tcltk-libs were # Check whether --with-tcltk-includes and --with-tcltk-libs were
...@@ -1801,7 +1804,7 @@ class PyBuildExt(build_ext): ...@@ -1801,7 +1804,7 @@ class PyBuildExt(build_ext):
# AquaTk is a separate method. Only one Tkinter will be built on # AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk. # Darwin - either AquaTk, if it is found, or X11 based Tk.
if (MACOS and if (MACOS and
self.detect_tkinter_darwin(inc_dirs, lib_dirs)): self.detect_tkinter_darwin()):
return return
# Assume we haven't found any of the libraries or include files # Assume we haven't found any of the libraries or include files
...@@ -1810,9 +1813,9 @@ class PyBuildExt(build_ext): ...@@ -1810,9 +1813,9 @@ class PyBuildExt(build_ext):
tcllib = tklib = tcl_includes = tk_includes = None tcllib = tklib = tcl_includes = tk_includes = None
for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83', for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
'8.2', '82', '8.1', '81', '8.0', '80']: '8.2', '82', '8.1', '81', '8.0', '80']:
tklib = self.compiler.find_library_file(lib_dirs, tklib = self.compiler.find_library_file(self.lib_dirs,
'tk' + version) 'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs, tcllib = self.compiler.find_library_file(self.lib_dirs,
'tcl' + version) 'tcl' + version)
if tklib and tcllib: if tklib and tcllib:
# Exit the loop when we've found the Tcl/Tk libraries # Exit the loop when we've found the Tcl/Tk libraries
...@@ -1829,12 +1832,12 @@ class PyBuildExt(build_ext): ...@@ -1829,12 +1832,12 @@ class PyBuildExt(build_ext):
dotversion = dotversion[:-1] + '.' + dotversion[-1] dotversion = dotversion[:-1] + '.' + dotversion[-1]
tcl_include_sub = [] tcl_include_sub = []
tk_include_sub = [] tk_include_sub = []
for dir in inc_dirs: for dir in self.inc_dirs:
tcl_include_sub += [dir + os.sep + "tcl" + dotversion] tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
tk_include_sub += [dir + os.sep + "tk" + dotversion] tk_include_sub += [dir + os.sep + "tk" + dotversion]
tk_include_sub += tcl_include_sub tk_include_sub += tcl_include_sub
tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub) tcl_includes = find_file('tcl.h', self.inc_dirs, tcl_include_sub)
tk_includes = find_file('tk.h', inc_dirs, tk_include_sub) tk_includes = find_file('tk.h', self.inc_dirs, tk_include_sub)
if (tcllib is None or tklib is None or if (tcllib is None or tklib is None or
tcl_includes is None or tk_includes is None): tcl_includes is None or tk_includes is None):
...@@ -1871,11 +1874,11 @@ class PyBuildExt(build_ext): ...@@ -1871,11 +1874,11 @@ class PyBuildExt(build_ext):
return return
# Check for BLT extension # Check for BLT extension
if self.compiler.find_library_file(lib_dirs + added_lib_dirs, if self.compiler.find_library_file(self.lib_dirs + added_lib_dirs,
'BLT8.0'): 'BLT8.0'):
defs.append( ('WITH_BLT', 1) ) defs.append( ('WITH_BLT', 1) )
libs.append('BLT8.0') libs.append('BLT8.0')
elif self.compiler.find_library_file(lib_dirs + added_lib_dirs, elif self.compiler.find_library_file(self.lib_dirs + added_lib_dirs,
'BLT'): 'BLT'):
defs.append( ('WITH_BLT', 1) ) defs.append( ('WITH_BLT', 1) )
libs.append('BLT') libs.append('BLT')
...@@ -1910,8 +1913,7 @@ class PyBuildExt(build_ext): ...@@ -1910,8 +1913,7 @@ class PyBuildExt(build_ext):
def configure_ctypes_darwin(self, ext): def configure_ctypes_darwin(self, ext):
# Darwin (OS X) uses preconfigured files, in # Darwin (OS X) uses preconfigured files, in
# the Modules/_ctypes/libffi_osx directory. # the Modules/_ctypes/libffi_osx directory.
srcdir = sysconfig.get_config_var('srcdir') ffi_srcdir = os.path.abspath(os.path.join(self.srcdir, 'Modules',
ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
'_ctypes', 'libffi_osx')) '_ctypes', 'libffi_osx'))
sources = [os.path.join(ffi_srcdir, p) sources = [os.path.join(ffi_srcdir, p)
for p in ['ffi.c', for p in ['ffi.c',
...@@ -1942,7 +1944,7 @@ class PyBuildExt(build_ext): ...@@ -1942,7 +1944,7 @@ class PyBuildExt(build_ext):
return False return False
return True return True
def detect_ctypes(self, inc_dirs, lib_dirs): def detect_ctypes(self):
self.use_system_libffi = False self.use_system_libffi = False
include_dirs = [] include_dirs = []
extra_compile_args = [] extra_compile_args = []
...@@ -1989,7 +1991,7 @@ class PyBuildExt(build_ext): ...@@ -1989,7 +1991,7 @@ class PyBuildExt(build_ext):
libraries=['m']) libraries=['m'])
self.extensions.extend([ext, ext_test]) self.extensions.extend([ext, ext_test])
ffi_inc_dirs = inc_dirs.copy() ffi_inc_dirs = self.inc_dirs.copy()
if MACOS: if MACOS:
if '--with-system-ffi' not in sysconfig.get_config_var("CONFIG_ARGS"): if '--with-system-ffi' not in sysconfig.get_config_var("CONFIG_ARGS"):
return return
...@@ -2008,7 +2010,7 @@ class PyBuildExt(build_ext): ...@@ -2008,7 +2010,7 @@ class PyBuildExt(build_ext):
ffi_lib = None ffi_lib = None
if ffi_inc is not None: if ffi_inc is not None:
for lib_name in ('ffi', 'ffi_pic'): for lib_name in ('ffi', 'ffi_pic'):
if (self.compiler.find_library_file(lib_dirs, lib_name)): if (self.compiler.find_library_file(self.lib_dirs, lib_name)):
ffi_lib = lib_name ffi_lib = lib_name
break break
...@@ -2030,8 +2032,7 @@ class PyBuildExt(build_ext): ...@@ -2030,8 +2032,7 @@ class PyBuildExt(build_ext):
sources = ['_decimal/_decimal.c'] sources = ['_decimal/_decimal.c']
depends = ['_decimal/docstrings.h'] depends = ['_decimal/docstrings.h']
else: else:
srcdir = sysconfig.get_config_var('srcdir') include_dirs = [os.path.abspath(os.path.join(self.srcdir,
include_dirs = [os.path.abspath(os.path.join(srcdir,
'Modules', 'Modules',
'_decimal', '_decimal',
'libmpdec'))] 'libmpdec'))]
...@@ -2137,7 +2138,7 @@ class PyBuildExt(build_ext): ...@@ -2137,7 +2138,7 @@ class PyBuildExt(build_ext):
sources=sources, sources=sources,
depends=depends)) depends=depends))
def _detect_openssl(self, inc_dirs, lib_dirs): def _detect_openssl(self):
config_vars = sysconfig.get_config_vars() config_vars = sysconfig.get_config_vars()
def split_var(name, sep): def split_var(name, sep):
...@@ -2160,14 +2161,14 @@ class PyBuildExt(build_ext): ...@@ -2160,14 +2161,14 @@ class PyBuildExt(build_ext):
# Find OpenSSL includes # Find OpenSSL includes
ssl_incs = find_file( ssl_incs = find_file(
'openssl/ssl.h', inc_dirs, openssl_includes 'openssl/ssl.h', self.inc_dirs, openssl_includes
) )
if ssl_incs is None: if ssl_incs is None:
return None, None return None, None
# OpenSSL 1.0.2 uses Kerberos for KRB5 ciphers # OpenSSL 1.0.2 uses Kerberos for KRB5 ciphers
krb5_h = find_file( krb5_h = find_file(
'krb5.h', inc_dirs, 'krb5.h', self.inc_dirs,
['/usr/kerberos/include'] ['/usr/kerberos/include']
) )
if krb5_h: if krb5_h:
...@@ -2188,7 +2189,7 @@ class PyBuildExt(build_ext): ...@@ -2188,7 +2189,7 @@ class PyBuildExt(build_ext):
library_dirs=openssl_libdirs, library_dirs=openssl_libdirs,
libraries=openssl_libs)) libraries=openssl_libs))
def _detect_nis(self, inc_dirs, lib_dirs): def _detect_nis(self):
if MS_WINDOWS or CYGWIN or HOST_PLATFORM == 'qnx6': if MS_WINDOWS or CYGWIN or HOST_PLATFORM == 'qnx6':
self.missing.append('nis') self.missing.append('nis')
return return
...@@ -2201,12 +2202,12 @@ class PyBuildExt(build_ext): ...@@ -2201,12 +2202,12 @@ class PyBuildExt(build_ext):
# moved headers and libraries to libtirpc and libnsl. The headers # moved headers and libraries to libtirpc and libnsl. The headers
# are in tircp and nsl sub directories. # are in tircp and nsl sub directories.
rpcsvc_inc = find_file( rpcsvc_inc = find_file(
'rpcsvc/yp_prot.h', inc_dirs, 'rpcsvc/yp_prot.h', self.inc_dirs,
[os.path.join(inc_dir, 'nsl') for inc_dir in inc_dirs] [os.path.join(inc_dir, 'nsl') for inc_dir in self.inc_dirs]
) )
rpc_inc = find_file( rpc_inc = find_file(
'rpc/rpc.h', inc_dirs, 'rpc/rpc.h', self.inc_dirs,
[os.path.join(inc_dir, 'tirpc') for inc_dir in inc_dirs] [os.path.join(inc_dir, 'tirpc') for inc_dir in self.inc_dirs]
) )
if rpcsvc_inc is None or rpc_inc is None: if rpcsvc_inc is None or rpc_inc is None:
# not found # not found
...@@ -2215,17 +2216,17 @@ class PyBuildExt(build_ext): ...@@ -2215,17 +2216,17 @@ class PyBuildExt(build_ext):
includes_dirs.extend(rpcsvc_inc) includes_dirs.extend(rpcsvc_inc)
includes_dirs.extend(rpc_inc) includes_dirs.extend(rpc_inc)
if self.compiler.find_library_file(lib_dirs, 'nsl'): if self.compiler.find_library_file(self.lib_dirs, 'nsl'):
libs.append('nsl') libs.append('nsl')
else: else:
# libnsl-devel: check for libnsl in nsl/ subdirectory # libnsl-devel: check for libnsl in nsl/ subdirectory
nsl_dirs = [os.path.join(lib_dir, 'nsl') for lib_dir in lib_dirs] nsl_dirs = [os.path.join(lib_dir, 'nsl') for lib_dir in self.lib_dirs]
libnsl = self.compiler.find_library_file(nsl_dirs, 'nsl') libnsl = self.compiler.find_library_file(nsl_dirs, 'nsl')
if libnsl is not None: if libnsl is not None:
library_dirs.append(os.path.dirname(libnsl)) library_dirs.append(os.path.dirname(libnsl))
libs.append('nsl') libs.append('nsl')
if self.compiler.find_library_file(lib_dirs, 'tirpc'): if self.compiler.find_library_file(self.lib_dirs, 'tirpc'):
libs.append('tirpc') libs.append('tirpc')
self.add(Extension('nis', ['nismodule.c'], self.add(Extension('nis', ['nismodule.c'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7