summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-01-19 21:56:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:07:15 +0000
commit113e1365a88c5bcdaa8f6b06146de6ff2454a385 (patch)
tree2c8bd39638b8bc3df793bd3bc99e454634ccdcb8 /meta/recipes-devtools/python/python3
parent918149d340c93227fa2cc97ea2a9013983f487e6 (diff)
downloadpoky-113e1365a88c5bcdaa8f6b06146de6ff2454a385.tar.gz
python3: Minor upgrade 3.5.0 -> 3.5.1
Rebased: - 000-cross-compile.patch (From OE-Core rev: f1d9f7b2ea930fec3198264a2d1d04088efc8f3c) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3')
-rw-r--r--meta/recipes-devtools/python/python3/000-cross-compile.patch30
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-devtools/python/python3/000-cross-compile.patch b/meta/recipes-devtools/python/python3/000-cross-compile.patch
index a3ffe3bea8..28fe70adb3 100644
--- a/meta/recipes-devtools/python/python3/000-cross-compile.patch
+++ b/meta/recipes-devtools/python/python3/000-cross-compile.patch
@@ -9,11 +9,11 @@ Upstream-Status: Inappropriate[Configuration Specific]
9 Makefile.pre.in | 25 +++++++++++++------------ 9 Makefile.pre.in | 25 +++++++++++++------------
10 1 file changed, 13 insertions(+), 12 deletions(-) 10 1 file changed, 13 insertions(+), 12 deletions(-)
11 11
12Index: Python-3.5.0/Makefile.pre.in 12Index: Python-3.5.1/Makefile.pre.in
13=================================================================== 13===================================================================
14--- Python-3.5.0.orig/Makefile.pre.in 14--- Python-3.5.1.orig/Makefile.pre.in
15+++ Python-3.5.0/Makefile.pre.in 15+++ Python-3.5.1/Makefile.pre.in
16@@ -215,6 +215,7 @@ LIBOBJS= @LIBOBJS@ 16@@ -220,6 +220,7 @@ LIBOBJS= @LIBOBJS@
17 17
18 PYTHON= python$(EXE) 18 PYTHON= python$(EXE)
19 BUILDPYTHON= python$(BUILDEXE) 19 BUILDPYTHON= python$(BUILDEXE)
@@ -21,7 +21,7 @@ Index: Python-3.5.0/Makefile.pre.in
21 21
22 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ 22 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
23 _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ 23 _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
24@@ -272,6 +273,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ 24@@ -276,6 +277,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
25 ########################################################################## 25 ##########################################################################
26 # Parser 26 # Parser
27 PGEN= Parser/pgen$(EXE) 27 PGEN= Parser/pgen$(EXE)
@@ -29,16 +29,16 @@ Index: Python-3.5.0/Makefile.pre.in
29 29
30 PSRCS= \ 30 PSRCS= \
31 Parser/acceler.c \ 31 Parser/acceler.c \
32@@ -494,7 +496,7 @@ build_all_generate_profile: 32@@ -506,7 +508,7 @@ build_all_generate_profile:
33 33
34 run_profile_task: 34 run_profile_task:
35 : # FIXME: can't run for a cross build 35 : # FIXME: can't run for a cross build
36- $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) 36- $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
37+ $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) 37+ $(LLVM_PROF_FILE) $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) || true
38 38
39 build_all_use_profile: 39 build_all_merge_profile:
40 $(MAKE) all CFLAGS_NODIST="$(CFLAGS) -fprofile-use -fprofile-correction" 40 $(LLVM_PROF_MERGER)
41@@ -764,7 +766,7 @@ $(IO_OBJS): $(IO_H) 41@@ -779,7 +781,7 @@ $(IO_OBJS): $(IO_H)
42 42
43 $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) 43 $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
44 @$(MKDIR_P) Include 44 @$(MKDIR_P) Include
@@ -47,7 +47,7 @@ Index: Python-3.5.0/Makefile.pre.in
47 $(GRAMMAR_C): $(GRAMMAR_H) 47 $(GRAMMAR_C): $(GRAMMAR_H)
48 touch $(GRAMMAR_C) 48 touch $(GRAMMAR_C)
49 49
50@@ -953,7 +955,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth 50@@ -968,7 +970,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth
51 ###################################################################### 51 ######################################################################
52 52
53 TESTOPTS= $(EXTRATESTOPTS) 53 TESTOPTS= $(EXTRATESTOPTS)
@@ -56,7 +56,7 @@ Index: Python-3.5.0/Makefile.pre.in
56 TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py 56 TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
57 TESTTIMEOUT= 3600 57 TESTTIMEOUT= 3600
58 58
59@@ -1440,7 +1442,7 @@ frameworkinstallstructure: $(LDLIBRARY) 59@@ -1455,7 +1457,7 @@ frameworkinstallstructure: $(LDLIBRARY)
60 fi; \ 60 fi; \
61 done 61 done
62 $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers 62 $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
@@ -65,7 +65,7 @@ Index: Python-3.5.0/Makefile.pre.in
65 $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current 65 $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
66 $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) 66 $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
67 $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers 67 $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
68@@ -1506,7 +1508,7 @@ config.status: $(srcdir)/configure 68@@ -1521,7 +1523,7 @@ config.status: $(srcdir)/configure
69 69
70 # Run reindent on the library 70 # Run reindent on the library
71 reindent: 71 reindent:
@@ -74,7 +74,7 @@ Index: Python-3.5.0/Makefile.pre.in
74 74
75 # Rerun configure with the same options as it was run last time, 75 # Rerun configure with the same options as it was run last time,
76 # provided the config.status script exists 76 # provided the config.status script exists
77@@ -1639,7 +1641,7 @@ funny: 77@@ -1656,7 +1658,7 @@ funny:
78 78
79 # Perform some verification checks on any modified files. 79 # Perform some verification checks on any modified files.
80 patchcheck: all 80 patchcheck: all