Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

reverted the usage of compiler_obj in Python's setup.py

This commit is contained in:
Tarek Ziadé 2010-03-05 00:29:38 +00:00
parent dd7bef9bf5
commit 35a3f57937
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
setup.py
View File

@ -187,7 +187,7 @@ class PyBuildExt(build_ext):
if compiler is not None: if compiler is not None:
(ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS') (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
self.compiler_obj.set_executables(**args) self.compiler.set_executables(**args)
build_ext.build_extensions(self) build_ext.build_extensions(self)
@ -302,8 +302,8 @@ class PyBuildExt(build_ext):
def detect_modules(self): def detect_modules(self):
# Ensure that /usr/local is always used # Ensure that /usr/local is always used
add_dir_to_list(self.compiler_obj.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler_obj.include_dirs, '/usr/local/include') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
# Add paths specified in the environment variables LDFLAGS and # Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files. # CPPFLAGS for header and library files.
@ -312,9 +312,9 @@ class PyBuildExt(build_ext):
# the environment variable is not set even though the value were passed # the environment variable is not set even though the value were passed
# into configure and stored in the Makefile (issue found on OS X 10.3). # into configure and stored in the Makefile (issue found on OS X 10.3).
for env_var, arg_name, dir_list in ( for env_var, arg_name, dir_list in (
('LDFLAGS', '-R', self.compiler_obj.runtime_library_dirs), ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
('LDFLAGS', '-L', self.compiler_obj.library_dirs), ('LDFLAGS', '-L', self.compiler.library_dirs),
('CPPFLAGS', '-I', self.compiler_obj.include_dirs)): ('CPPFLAGS', '-I', self.compiler.include_dirs)):
env_val = sysconfig.get_config_var(env_var) env_val = sysconfig.get_config_var(env_var)
if env_val: if env_val:
# To prevent optparse from raising an exception about any # To prevent optparse from raising an exception about any
@ -340,9 +340,9 @@ class PyBuildExt(build_ext):
add_dir_to_list(dir_list, directory) add_dir_to_list(dir_list, directory)
if os.path.normpath(sys.prefix) != '/usr': if os.path.normpath(sys.prefix) != '/usr':
add_dir_to_list(self.compiler_obj.library_dirs, add_dir_to_list(self.compiler.library_dirs,
sysconfig.get_config_var("LIBDIR")) sysconfig.get_config_var("LIBDIR"))
add_dir_to_list(self.compiler_obj.include_dirs, add_dir_to_list(self.compiler.include_dirs,
sysconfig.get_config_var("INCLUDEDIR")) sysconfig.get_config_var("INCLUDEDIR"))
try: try:
@ -353,11 +353,11 @@ class PyBuildExt(build_ext):
# lib_dirs and inc_dirs are used to search for files; # lib_dirs and inc_dirs are used to search for files;
# 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.
lib_dirs = self.compiler_obj.library_dirs + [ lib_dirs = self.compiler.library_dirs + [
'/lib64', '/usr/lib64', '/lib64', '/usr/lib64',
'/lib', '/usr/lib', '/lib', '/usr/lib',
] ]
inc_dirs = self.compiler_obj.include_dirs + ['/usr/include'] inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = [] exts = []
missing = [] missing = []
@ -549,7 +549,7 @@ class PyBuildExt(build_ext):
missing.extend(['imageop']) missing.extend(['imageop'])
# readline # readline
do_readline = self.compiler_obj.find_library_file(lib_dirs, 'readline') do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
if platform == 'darwin': if platform == 'darwin':
os_release = int(os.uname()[2].split('.')[0]) os_release = int(os.uname()[2].split('.')[0])
if os_release < 9: if os_release < 9:
@ -570,15 +570,15 @@ class PyBuildExt(build_ext):
readline_extra_link_args = () readline_extra_link_args = ()
readline_libs = ['readline'] readline_libs = ['readline']
if self.compiler_obj.find_library_file(lib_dirs, if self.compiler.find_library_file(lib_dirs,
'ncursesw'): 'ncursesw'):
readline_libs.append('ncursesw') readline_libs.append('ncursesw')
elif self.compiler_obj.find_library_file(lib_dirs, elif self.compiler.find_library_file(lib_dirs,
'ncurses'): 'ncurses'):
readline_libs.append('ncurses') readline_libs.append('ncurses')
elif self.compiler_obj.find_library_file(lib_dirs, 'curses'): elif self.compiler.find_library_file(lib_dirs, 'curses'):
readline_libs.append('curses') readline_libs.append('curses')
elif self.compiler_obj.find_library_file(lib_dirs + elif self.compiler.find_library_file(lib_dirs +
['/usr/lib/termcap'], ['/usr/lib/termcap'],
'termcap'): 'termcap'):
readline_libs.append('termcap') readline_libs.append('termcap')
@ -592,7 +592,7 @@ class PyBuildExt(build_ext):
if platform not in ['mac']: if platform not in ['mac']:
# crypt module. # crypt module.
if self.compiler_obj.find_library_file(lib_dirs, 'crypt'): if self.compiler.find_library_file(lib_dirs, 'crypt'):
libs = ['crypt'] libs = ['crypt']
else: else:
libs = [] libs = []
@ -619,7 +619,7 @@ class PyBuildExt(build_ext):
['/usr/kerberos/include']) ['/usr/kerberos/include'])
if krb5_h: if krb5_h:
ssl_incs += krb5_h ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler_obj, '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/' '/usr/contrib/ssl/lib/'
] ) ] )
@ -849,7 +849,7 @@ class PyBuildExt(build_ext):
for dblib in (('db-%d.%d' % db_ver), for dblib in (('db-%d.%d' % db_ver),
('db%d%d' % db_ver), ('db%d%d' % db_ver),
('db%d' % db_ver[0])): ('db%d' % db_ver[0])):
dblib_file = self.compiler_obj.find_library_file( dblib_file = self.compiler.find_library_file(
db_dirs_to_check + lib_dirs, dblib ) db_dirs_to_check + 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)) ]
@ -933,7 +933,7 @@ class PyBuildExt(build_ext):
os.path.join(sqlite_incdir, '..', '..', 'lib64'), os.path.join(sqlite_incdir, '..', '..', 'lib64'),
os.path.join(sqlite_incdir, '..', '..', 'lib'), os.path.join(sqlite_incdir, '..', '..', 'lib'),
] ]
sqlite_libfile = self.compiler_obj.find_library_file( sqlite_libfile = self.compiler.find_library_file(
sqlite_dirs_to_check + lib_dirs, 'sqlite3') sqlite_dirs_to_check + 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))]
@ -1024,7 +1024,7 @@ class PyBuildExt(build_ext):
if cand == "ndbm": if cand == "ndbm":
if find_file("ndbm.h", inc_dirs, []) is not None: if find_file("ndbm.h", inc_dirs, []) is not None:
# Some systems have -lndbm, others don't # Some systems have -lndbm, others don't
if self.compiler_obj.find_library_file(lib_dirs, if self.compiler.find_library_file(lib_dirs,
'ndbm'): 'ndbm'):
ndbm_libs = ['ndbm'] ndbm_libs = ['ndbm']
else: else:
@ -1038,9 +1038,9 @@ class PyBuildExt(build_ext):
break break
elif cand == "gdbm": elif cand == "gdbm":
if self.compiler_obj.find_library_file(lib_dirs, 'gdbm'): if self.compiler.find_library_file(lib_dirs, 'gdbm'):
gdbm_libs = ['gdbm'] gdbm_libs = ['gdbm']
if self.compiler_obj.find_library_file(lib_dirs, if self.compiler.find_library_file(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", inc_dirs, []) is not None:
@ -1081,7 +1081,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_obj.find_library_file(lib_dirs, 'gdbm')): self.compiler.find_library_file(lib_dirs, 'gdbm')):
exts.append( Extension('gdbm', ['gdbmmodule.c'], exts.append( Extension('gdbm', ['gdbmmodule.c'],
libraries = ['gdbm'] ) ) libraries = ['gdbm'] ) )
else: else:
@ -1100,7 +1100,7 @@ class PyBuildExt(build_ext):
# Sun yellow pages. Some systems have the functions in libc. # Sun yellow pages. Some systems have the functions in libc.
if (platform not in ['cygwin', 'atheos', 'qnx6'] and if (platform not in ['cygwin', 'atheos', 'qnx6'] and
find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
if (self.compiler_obj.find_library_file(lib_dirs, 'nsl')): if (self.compiler.find_library_file(lib_dirs, 'nsl')):
libs = ['nsl'] libs = ['nsl']
else: else:
libs = [] libs = []
@ -1114,24 +1114,24 @@ class PyBuildExt(build_ext):
# 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.
panel_library = 'panel' panel_library = 'panel'
if (self.compiler_obj.find_library_file(lib_dirs, 'ncursesw')): if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
curses_libs = ['ncursesw'] curses_libs = ['ncursesw']
# Bug 1464056: If _curses.so links with ncursesw, # Bug 1464056: If _curses.so links with ncursesw,
# _curses_panel.so must link with panelw. # _curses_panel.so must link with panelw.
panel_library = 'panelw' panel_library = 'panelw'
exts.append( Extension('_curses', ['_cursesmodule.c'], exts.append( Extension('_curses', ['_cursesmodule.c'],
libraries = curses_libs) ) libraries = curses_libs) )
elif (self.compiler_obj.find_library_file(lib_dirs, 'ncurses')): elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
curses_libs = ['ncurses'] curses_libs = ['ncurses']
exts.append( Extension('_curses', ['_cursesmodule.c'], exts.append( Extension('_curses', ['_cursesmodule.c'],
libraries = curses_libs) ) libraries = curses_libs) )
elif (self.compiler_obj.find_library_file(lib_dirs, 'curses') elif (self.compiler.find_library_file(lib_dirs, 'curses')
and platform != 'darwin'): and platform != 'darwin'):
# 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_obj.find_library_file(lib_dirs, 'terminfo')): if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
curses_libs = ['curses', 'terminfo'] curses_libs = ['curses', 'terminfo']
elif (self.compiler_obj.find_library_file(lib_dirs, 'termcap')): elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
curses_libs = ['curses', 'termcap'] curses_libs = ['curses', 'termcap']
else: else:
curses_libs = ['curses'] curses_libs = ['curses']
@ -1143,7 +1143,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(exts, '_curses') and if (module_enabled(exts, '_curses') and
self.compiler_obj.find_library_file(lib_dirs, panel_library)): self.compiler.find_library_file(lib_dirs, panel_library)):
exts.append( Extension('_curses_panel', ['_curses_panel.c'], exts.append( Extension('_curses_panel', ['_curses_panel.c'],
libraries = [panel_library] + curses_libs) ) libraries = [panel_library] + curses_libs) )
else: else:
@ -1176,7 +1176,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_obj.find_library_file(lib_dirs, 'z')): if (self.compiler.find_library_file(lib_dirs, 'z')):
if sys.platform == "darwin": if sys.platform == "darwin":
zlib_extra_link_args = ('-Wl,-search_paths_first',) zlib_extra_link_args = ('-Wl,-search_paths_first',)
else: else:
@ -1208,7 +1208,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_obj.find_library_file(lib_dirs, 'bz2')): if (self.compiler.find_library_file(lib_dirs, 'bz2')):
if sys.platform == "darwin": if sys.platform == "darwin":
bz2_extra_link_args = ('-Wl,-search_paths_first',) bz2_extra_link_args = ('-Wl,-search_paths_first',)
else: else:
@ -1571,9 +1571,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_obj.find_library_file(lib_dirs, tklib = self.compiler.find_library_file(lib_dirs,
'tk' + version) 'tk' + version)
tcllib = self.compiler_obj.find_library_file(lib_dirs, tcllib = self.compiler.find_library_file(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
@ -1632,11 +1632,11 @@ class PyBuildExt(build_ext):
return return
# Check for BLT extension # Check for BLT extension
if self.compiler_obj.find_library_file(lib_dirs + added_lib_dirs, if self.compiler.find_library_file(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_obj.find_library_file(lib_dirs + added_lib_dirs, elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
'BLT'): 'BLT'):
defs.append( ('WITH_BLT', 1) ) defs.append( ('WITH_BLT', 1) )
libs.append('BLT') libs.append('BLT')
@ -1691,7 +1691,7 @@ class PyBuildExt(build_ext):
]] ]]
# Add .S (preprocessed assembly) to C compiler source extensions. # Add .S (preprocessed assembly) to C compiler source extensions.
self.compiler_obj.src_extensions.append('.S') self.compiler.src_extensions.append('.S')
include_dirs = [os.path.join(ffi_srcdir, 'include'), include_dirs = [os.path.join(ffi_srcdir, 'include'),
os.path.join(ffi_srcdir, 'powerpc')] os.path.join(ffi_srcdir, 'powerpc')]
@ -1736,7 +1736,7 @@ class PyBuildExt(build_ext):
exec f in fficonfig exec f in fficonfig
# Add .S (preprocessed assembly) to C compiler source extensions. # Add .S (preprocessed assembly) to C compiler source extensions.
self.compiler_obj.src_extensions.append('.S') self.compiler.src_extensions.append('.S')
include_dirs = [os.path.join(ffi_builddir, 'include'), include_dirs = [os.path.join(ffi_builddir, 'include'),
ffi_builddir, ffi_builddir,
@ -1818,7 +1818,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_convenience', 'ffi_pic', 'ffi'): for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
if (self.compiler_obj.find_library_file(lib_dirs, lib_name)): if (self.compiler.find_library_file(lib_dirs, lib_name)):
ffi_lib = lib_name ffi_lib = lib_name
break break