diff --git a/srcpkgs/python3.5/files/cross.patch b/srcpkgs/python3.5/files/cross.patch index 932add5d20..479ee898f9 100644 --- a/srcpkgs/python3.5/files/cross.patch +++ b/srcpkgs/python3.5/files/cross.patch @@ -48,42 +48,6 @@ if res or not os.path.exists(ffi_configfile): --- Makefile.pre.in.orig 2015-09-13 13:41:23.000000000 +0200 +++ Makefile.pre.in 2015-09-14 17:56:11.792632577 +0200 -@@ -691,16 +691,16 @@ - ############################################################################ - # Importlib - --Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile -- - Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) - $(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 -+Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib.c -+ $(MAKE) Programs/_freeze_importlib - ./Programs/_freeze_importlib \ - $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h - --Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib -+Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib.c -+ $(MAKE) Programs/_freeze_importlib - ./Programs/_freeze_importlib \ - $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h - -@@ -762,10 +762,12 @@ - - $(IO_OBJS): $(IO_H) - --$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) -+$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) - @$(MKDIR_P) Include -+ $(MAKE) $(PGEN) - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) --$(GRAMMAR_C): $(GRAMMAR_H) -+$(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) -+ $(MAKE) $(GRAMMAR_H) - touch $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS) @@ -1011,8 +1013,6 @@ upgrade) ensurepip="--upgrade" ;; \ install|*) ensurepip="" ;; \ diff --git a/srcpkgs/python3.5/template b/srcpkgs/python3.5/template index e252f1f39f..89ea4f711b 100644 --- a/srcpkgs/python3.5/template +++ b/srcpkgs/python3.5/template @@ -58,8 +58,6 @@ do_configure() { --enable-shared --without-ensurepip } do_build() { - # Avoid invoking pgen for cross-compiles. - touch Include/graminit.h Python/graminit.c export PATH="$PATH:$wrksrc/hostpython" make ${makejobs} }