aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2008-01-15 17:53:54 +0000
committerPJ Eby <distutils-sig@python.org>2008-01-15 17:53:54 +0000
commitce75692a87b83cef9ea539fc76f4a544b1398b35 (patch)
tree1a9f9ec4793d3d6e476f5c988a6c29a97924f630
parent00e90f6a642ebd652a8912dad19b752714c051a5 (diff)
downloadexternal_python_setuptools-ce75692a87b83cef9ea539fc76f4a544b1398b35.tar.gz
external_python_setuptools-ce75692a87b83cef9ea539fc76f4a544b1398b35.tar.bz2
external_python_setuptools-ce75692a87b83cef9ea539fc76f4a544b1398b35.zip
Update Pyrex/swig_sources workaround for newer Pyrex versions
(backport) --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4059983
-rwxr-xr-xsetuptools.txt2
-rw-r--r--setuptools/command/build_ext.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/setuptools.txt b/setuptools.txt
index c27f7981..d68e52c6 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -2616,6 +2616,8 @@ Release Notes/Change History
non-Windows platforms, due to distutils not handling manifest file line
endings correctly.
+ * Updated Pyrex support to work with Pyrex 0.9.6 and higher.
+
0.6c7
* Fixed ``distutils.filelist.findall()`` crashing on broken symlinks, and
``egg_info`` command failing on new, uncommitted SVN directories.
diff --git a/setuptools/command/build_ext.py b/setuptools/command/build_ext.py
index a4b9047e..c9ae4d7d 100644
--- a/setuptools/command/build_ext.py
+++ b/setuptools/command/build_ext.py
@@ -70,7 +70,7 @@ class build_ext(_build_ext):
self.write_stub(package_dir or os.curdir, ext, True)
- if _build_ext is not _du_build_ext:
+ if _build_ext is not _du_build_ext and not hasattr(_build_ext,'pyrex_sources'):
# Workaround for problems using some Pyrex versions w/SWIG and/or 2.4
def swig_sources(self, sources, *otherargs):
# first do any Pyrex processing