mirror of
https://git.yoctoproject.org/poky
synced 2026-02-07 01:06:37 +01:00
python3-native: Upgrade from 3.5.1 to 3.5.2
LICENSE did not change, only dates were changed Rebases: - 000-cross-compile.patch - python-3.3-multilib.patch (From OE-Core rev: 0a3a4047e779c8bff2b5e2bfa37b7ab119d08d4b) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
adf4266524
commit
3ab991bee2
@@ -9,19 +9,19 @@ Upstream-Status: Inappropriate[Configuration Specific]
|
||||
Makefile.pre.in | 25 +++++++++++++------------
|
||||
1 file changed, 13 insertions(+), 12 deletions(-)
|
||||
|
||||
Index: Python-3.5.1/Makefile.pre.in
|
||||
Index: Python-3.5.2/Makefile.pre.in
|
||||
===================================================================
|
||||
--- Python-3.5.1.orig/Makefile.pre.in
|
||||
+++ Python-3.5.1/Makefile.pre.in
|
||||
--- Python-3.5.2.orig/Makefile.pre.in
|
||||
+++ Python-3.5.2/Makefile.pre.in
|
||||
@@ -220,6 +220,7 @@ LIBOBJS= @LIBOBJS@
|
||||
|
||||
PYTHON= python$(EXE)
|
||||
BUILDPYTHON= python$(BUILDEXE)
|
||||
+HOSTPYTHON= $(BUILDPYTHON)
|
||||
|
||||
cross_compiling=@cross_compiling@
|
||||
PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
|
||||
_PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
|
||||
@@ -276,6 +277,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
|
||||
@@ -279,6 +280,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
|
||||
##########################################################################
|
||||
# Parser
|
||||
PGEN= Parser/pgen$(EXE)
|
||||
@@ -29,7 +29,7 @@ Index: Python-3.5.1/Makefile.pre.in
|
||||
|
||||
PSRCS= \
|
||||
Parser/acceler.c \
|
||||
@@ -506,7 +508,7 @@ build_all_generate_profile:
|
||||
@@ -509,7 +511,7 @@ build_all_generate_profile:
|
||||
|
||||
run_profile_task:
|
||||
: # FIXME: can't run for a cross build
|
||||
@@ -38,16 +38,16 @@ Index: Python-3.5.1/Makefile.pre.in
|
||||
|
||||
build_all_merge_profile:
|
||||
$(LLVM_PROF_MERGER)
|
||||
@@ -779,7 +781,7 @@ $(IO_OBJS): $(IO_H)
|
||||
|
||||
$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
|
||||
@$(MKDIR_P) Include
|
||||
- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
||||
+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
|
||||
$(GRAMMAR_C): $(GRAMMAR_H)
|
||||
touch $(GRAMMAR_C)
|
||||
|
||||
@@ -968,7 +970,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth
|
||||
@@ -792,7 +794,7 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
|
||||
@$(MKDIR_P) Include
|
||||
# Avoid copying the file onto itself for an in-tree build
|
||||
if test "$(cross_compiling)" != "yes"; then \
|
||||
- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
|
||||
+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
|
||||
else \
|
||||
cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \
|
||||
mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \
|
||||
@@ -990,7 +992,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth
|
||||
######################################################################
|
||||
|
||||
TESTOPTS= $(EXTRATESTOPTS)
|
||||
@@ -56,7 +56,7 @@ Index: Python-3.5.1/Makefile.pre.in
|
||||
TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
|
||||
TESTTIMEOUT= 3600
|
||||
|
||||
@@ -1455,7 +1457,7 @@ frameworkinstallstructure: $(LDLIBRARY)
|
||||
@@ -1481,7 +1483,7 @@ frameworkinstallstructure: $(LDLIBRARY)
|
||||
fi; \
|
||||
done
|
||||
$(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
|
||||
@@ -65,7 +65,7 @@ Index: Python-3.5.1/Makefile.pre.in
|
||||
$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
|
||||
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
|
||||
$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
|
||||
@@ -1521,7 +1523,7 @@ config.status: $(srcdir)/configure
|
||||
@@ -1547,7 +1549,7 @@ config.status: $(srcdir)/configure
|
||||
|
||||
# Run reindent on the library
|
||||
reindent:
|
||||
@@ -74,7 +74,7 @@ Index: Python-3.5.1/Makefile.pre.in
|
||||
|
||||
# Rerun configure with the same options as it was run last time,
|
||||
# provided the config.status script exists
|
||||
@@ -1656,7 +1658,7 @@ funny:
|
||||
@@ -1683,7 +1685,7 @@ funny:
|
||||
|
||||
# Perform some verification checks on any modified files.
|
||||
patchcheck: all
|
||||
|
||||
Reference in New Issue
Block a user