[Python-checkins] r43721 - python/trunk/setup.py
thomas.heller
python-checkins at python.org
Fri Apr 7 21:04:10 CEST 2006
Author: thomas.heller
Date: Fri Apr 7 21:04:09 2006
New Revision: 43721
Modified:
python/trunk/setup.py
Log:
Configure Modules/_ctypes/libffi just before building the _ctypes extension.
This avoids configuring it when it is not build by setup.py.
Modified: python/trunk/setup.py
==============================================================================
--- python/trunk/setup.py (original)
+++ python/trunk/setup.py Fri Apr 7 21:04:09 2006
@@ -180,6 +180,9 @@
def build_extension(self, ext):
+ if ext.name == '_ctypes':
+ self.configure_ctypes(ext)
+
try:
build_ext.build_extension(self, ext)
except (CCompilerError, DistutilsError), why:
@@ -1264,7 +1267,7 @@
# *** Uncomment these for TOGL extension only:
# -lGL -lGLU -lXext -lXmu \
- def detect_ctypes(self):
+ def configure_ctypes(self, ext):
(srcdir,) = sysconfig.get_config_vars('srcdir')
ffi_builddir = os.path.join(self.build_temp, 'libffi')
ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
@@ -1296,12 +1299,20 @@
include_dirs = [os.path.join(ffi_builddir, 'include'),
ffi_builddir, ffi_srcdir]
extra_compile_args = fficonfig['ffi_cflags'].split()
+
+ ext.sources.extend(fficonfig['ffi_sources'])
+ ext.include_dirs.extend(include_dirs)
+ ext.extra_compile_args.extend(extra_compile_args)
+
+ def detect_ctypes(self):
+ include_dirs = []
+ extra_compile_args = []
sources = ['_ctypes/_ctypes.c',
'_ctypes/callbacks.c',
'_ctypes/callproc.c',
'_ctypes/stgdict.c',
'_ctypes/cfield.c',
- '_ctypes/malloc_closure.c'] + fficonfig['ffi_sources']
+ '_ctypes/malloc_closure.c']
depends = ['_ctypes/ctypes.h']
if sys.platform == 'darwin':
More information about the Python-checkins
mailing list