jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

python3.5: fix cross builds

Browse source 
Issues with _freeze_importlib and pgen when cross-compiling has been
fixed upstream.
This commit is contained in:
Alessio Sergi 2016-06-27 09:25:35 +02:00
parent 9e752547d1
commit 594f42e64c
2 changed files with 0 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
srcpkgs/python3.5/files/cross.patch
View file

@ -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="" ;; \

2
srcpkgs/python3.5/template
View file

@ -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}
}