Merge remote-tracking branch 'origin/master' into staging.

This commit is contained in:
Peter Simons
2014-10-31 11:14:24 +01:00
261 changed files with 4084 additions and 1249 deletions

View File

@@ -135,11 +135,6 @@ let
buildPhase =
''
# Fake the build environment that setup.py expects.
ln -s ${python}/include/python*/pyconfig.h .
ln -s ${python}/lib/python*/config/Setup Modules/
ln -s ${python}/lib/python*/config/Setup.local Modules/
substituteInPlace setup.py --replace 'self.extensions = extensions' \
'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]'