diff options
Diffstat (limited to 'dev-lang/python/files/3.5.1-cross-compile.patch')
| -rw-r--r-- | dev-lang/python/files/3.5.1-cross-compile.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/dev-lang/python/files/3.5.1-cross-compile.patch b/dev-lang/python/files/3.5.1-cross-compile.patch deleted file mode 100644 index 25a518bd1e65..000000000000 --- a/dev-lang/python/files/3.5.1-cross-compile.patch +++ /dev/null @@ -1,75 +0,0 @@ -# HG changeset patch -# User Martin Panter <vadmium+py@gmail.com> -# Date 1461373124 0 -# Node ID 66e40df31faca467937c7b9d5d2e825471f97822 -# Parent a246047734b3496a7dc4ebaf1f0232dadf22eab6 -Issue #22359: Disable running cross-compiled _freeze_importlib and pgen - -Patch by Xavier de Gaye. - -diff --git a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -221,6 +221,7 @@ LIBOBJS= @LIBOBJS@ - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) - -+cross_compiling=@cross_compiling@ - PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ - _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ - BUILD_GNU_TYPE= @build@ -@@ -718,12 +719,16 @@ Programs/_freeze_importlib: Programs/_fr - $(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib -- ./Programs/_freeze_importlib \ -- $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h -+ if test "$(cross_compiling)" != "yes"; then \ -+ ./Programs/_freeze_importlib \ -+ $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h; \ -+ fi - - Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib -- ./Programs/_freeze_importlib \ -- $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h -+ if test "$(cross_compiling)" != "yes"; then \ -+ ./Programs/_freeze_importlib \ -+ $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h; \ -+ fi - - - ############################################################################ -@@ -784,10 +789,18 @@ Python/sysmodule.o: $(srcdir)/Python/sys - $(IO_OBJS): $(IO_H) - - $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) -- @$(MKDIR_P) Include -- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ @$(MKDIR_P) Include -+ if test "$(cross_compiling)" != "yes"; then \ -+ $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ -+ else \ -+ cp $(srcdir)/Include/graminit.h $(GRAMMAR_H); \ -+ fi - $(GRAMMAR_C): $(GRAMMAR_H) -- touch $(GRAMMAR_C) -+ if test "$(cross_compiling)" != "yes"; then \ -+ touch $(GRAMMAR_C); \ -+ else \ -+ cp $(srcdir)/Python/graminit.c $(GRAMMAR_C); \ -+ fi - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -49,6 +49,7 @@ fi - AC_CONFIG_SRCDIR([Include/object.h]) - AC_CONFIG_HEADER(pyconfig.h) - -+AC_SUBST(cross_compiling) - AC_CANONICAL_HOST - AC_SUBST(build) - AC_SUBST(host) - |