diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-12 13:55:29 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:45:03 -0600 |
| commit | 4f8292fb35dfff1fad141cffd27ac0710857ec15 (patch) | |
| tree | 8f77638044f9643d286d8d00e605dc5b05a31a1c /pkgs/development | |
| parent | 9bd4e00ce3698ded0c6a03745d16f51355fa119f (diff) | |
| download | nixlib-4f8292fb35dfff1fad141cffd27ac0710857ec15.tar nixlib-4f8292fb35dfff1fad141cffd27ac0710857ec15.tar.gz nixlib-4f8292fb35dfff1fad141cffd27ac0710857ec15.tar.bz2 nixlib-4f8292fb35dfff1fad141cffd27ac0710857ec15.tar.lz nixlib-4f8292fb35dfff1fad141cffd27ac0710857ec15.tar.xz nixlib-4f8292fb35dfff1fad141cffd27ac0710857ec15.tar.zst nixlib-4f8292fb35dfff1fad141cffd27ac0710857ec15.zip | |
python2.7: drop unused cross-compile patch
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch | 44 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 5 |
2 files changed, 0 insertions, 49 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch b/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch deleted file mode 100644 index 4d0c72675cc4..000000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 9ac1104b075ecea6175e2214b81c6538adbb9e84 -Author: Ben Gamari <ben@smart-cactus.org> -Date: Tue Oct 17 23:53:25 2017 -0400 - - Fix it - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index e288964..ddc7428 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1120,27 +1120,27 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -$(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -$(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -$(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -$(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt - - # Create the PLATDIR source directory, if one wasn't distributed.. diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 28ad3aeca918..61f17a959bd9 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -88,11 +88,6 @@ let # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. ./python-2.7-distutils-C++.patch - - ] ++ [ - - # Don't use pass host PYTHONPATH to build python - #./cross-compile.patch ]; preConfigure = '' |