edc01d04d6
* Initial python-3.7 port * python3: Add setup.config.in to remove before patching * python3: Implement setenv for mingw. Fix building with NT threads. Build with unicode * Fix typos * Fix linking core modules * Mingw build have exec_prefix * Remove deprecated patch * Fix building python and modules. Failing to build readline module and install not working yet * More getpath changes and more aggressive path separator conversion * Fix readline module compilation and linking errors * python3: By default building with posix threads, NT threads are broken. Some patches optimization. First buildable commit * Py_DecodeLocale handle char, not wchar * Fix building multiprocessing module with posix threads
50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
diff -Naur Python-3.7.0-orig/Makefile.pre.in Python-3.7.0/Makefile.pre.in
|
|
--- Python-3.7.0-orig/Makefile.pre.in 2018-06-30 11:17:22.782739400 +0300
|
|
+++ Python-3.7.0/Makefile.pre.in 2018-06-30 11:17:29.490751100 +0300
|
|
@@ -725,20 +725,20 @@
|
|
|
|
Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
|
|
|
|
-Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
|
|
+Programs/_freeze_importlib$(EXE): Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
|
|
$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
|
|
.PHONY: regen-importlib
|
|
-regen-importlib: Programs/_freeze_importlib
|
|
+regen-importlib: Programs/_freeze_importlib$(EXE)
|
|
# Regenerate Python/importlib_external.h
|
|
# from Lib/importlib/_bootstrap_external.py using _freeze_importlib
|
|
- ./Programs/_freeze_importlib \
|
|
+ ./Programs/_freeze_importlib$(EXE) \
|
|
$(srcdir)/Lib/importlib/_bootstrap_external.py \
|
|
$(srcdir)/Python/importlib_external.h.new
|
|
$(UPDATE_FILE) $(srcdir)/Python/importlib_external.h $(srcdir)/Python/importlib_external.h.new
|
|
# Regenerate Python/importlib.h from Lib/importlib/_bootstrap.py
|
|
# using _freeze_importlib
|
|
- ./Programs/_freeze_importlib \
|
|
+ ./Programs/_freeze_importlib$(EXE) \
|
|
$(srcdir)/Lib/importlib/_bootstrap.py \
|
|
$(srcdir)/Python/importlib.h.new
|
|
$(UPDATE_FILE) $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib.h.new
|
|
@@ -1697,7 +1697,7 @@
|
|
find build -name '*.py[co]' -exec rm -f {} ';' || true
|
|
-rm -f pybuilddir.txt
|
|
-rm -f Lib/lib2to3/*Grammar*.pickle
|
|
- -rm -f Programs/_testembed Programs/_freeze_importlib
|
|
+ -rm -f Programs/_testembed Programs/_freeze_importlib$(EXE)
|
|
-find build -type f -a ! -name '*.gc??' -exec rm -f {} ';'
|
|
-rm -f Include/pydtrace_probes.h
|
|
-rm -f profile-gen-stamp
|
|
diff -Naur Python-3.7.0-orig/Programs/_freeze_importlib.c Python-3.7.0/Programs/_freeze_importlib.c
|
|
--- Python-3.7.0-orig/Programs/_freeze_importlib.c 2018-06-27 06:07:35.000000000 +0300
|
|
+++ Python-3.7.0/Programs/_freeze_importlib.c 2018-06-30 11:17:29.490751100 +0300
|
|
@@ -20,7 +20,7 @@
|
|
{0, 0, 0} /* sentinel */
|
|
};
|
|
|
|
-#ifndef MS_WINDOWS
|
|
+#ifndef _MSC_VER
|
|
/* On Windows, this links with the regular pythonXY.dll, so this variable comes
|
|
from frozen.obj. In the Makefile, frozen.o is not linked into this executable,
|
|
so we define the variable here. */
|