summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:55:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:00 -0700
commita2fdf7fb08acef1b495fecee84ff536f0a33bb58 (patch)
tree48d9773bdc9d0b8a9f00c32752c5dc2de48ddd3d /meta/recipes-devtools/python
parent2a0f0adf0567f46f893685ff1e5e4f24f8e2cbbe (diff)
downloadpoky-a2fdf7fb08acef1b495fecee84ff536f0a33bb58.tar.gz
python: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 8a5c1328c4ea63443a92813c54bd2229c9959ff9) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python-native/multilib.patch78
-rw-r--r--meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch12
-rw-r--r--meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch13
-rw-r--r--meta/recipes-devtools/python/python/multilib.patch98
-rw-r--r--meta/recipes-devtools/python/python3/python-3.3-multilib.patch121
-rw-r--r--meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch12
6 files changed, 166 insertions, 168 deletions
diff --git a/meta/recipes-devtools/python/python-native/multilib.patch b/meta/recipes-devtools/python/python-native/multilib.patch
index ad46085094..af0f173c6d 100644
--- a/meta/recipes-devtools/python/python-native/multilib.patch
+++ b/meta/recipes-devtools/python/python-native/multilib.patch
@@ -12,10 +12,10 @@ Upstream-Status: Inappropriate [oe-specific]
12 12
13Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 13Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
14 14
15Index: Python-2.7.13/Include/pythonrun.h 15Index: Python-2.7.14/Include/pythonrun.h
16=================================================================== 16===================================================================
17--- Python-2.7.13.orig/Include/pythonrun.h 17--- Python-2.7.14.orig/Include/pythonrun.h
18+++ Python-2.7.13/Include/pythonrun.h 18+++ Python-2.7.14/Include/pythonrun.h
19@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); 19@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void);
20 /* In their own files */ 20 /* In their own files */
21 PyAPI_FUNC(const char *) Py_GetVersion(void); 21 PyAPI_FUNC(const char *) Py_GetVersion(void);
@@ -24,10 +24,10 @@ Index: Python-2.7.13/Include/pythonrun.h
24 PyAPI_FUNC(const char *) Py_GetCopyright(void); 24 PyAPI_FUNC(const char *) Py_GetCopyright(void);
25 PyAPI_FUNC(const char *) Py_GetCompiler(void); 25 PyAPI_FUNC(const char *) Py_GetCompiler(void);
26 PyAPI_FUNC(const char *) Py_GetBuildInfo(void); 26 PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
27Index: Python-2.7.13/Lib/distutils/command/install.py 27Index: Python-2.7.14/Lib/distutils/command/install.py
28=================================================================== 28===================================================================
29--- Python-2.7.13.orig/Lib/distutils/command/install.py 29--- Python-2.7.14.orig/Lib/distutils/command/install.py
30+++ Python-2.7.13/Lib/distutils/command/install.py 30+++ Python-2.7.14/Lib/distutils/command/install.py
31@@ -22,6 +22,8 @@ from site import USER_BASE 31@@ -22,6 +22,8 @@ from site import USER_BASE
32 from site import USER_SITE 32 from site import USER_SITE
33 33
@@ -46,10 +46,10 @@ Index: Python-2.7.13/Lib/distutils/command/install.py
46 'headers': '$base/include/python$py_version_short/$dist_name', 46 'headers': '$base/include/python$py_version_short/$dist_name',
47 'scripts': '$base/bin', 47 'scripts': '$base/bin',
48 'data' : '$base', 48 'data' : '$base',
49Index: Python-2.7.13/Lib/pydoc.py 49Index: Python-2.7.14/Lib/pydoc.py
50=================================================================== 50===================================================================
51--- Python-2.7.13.orig/Lib/pydoc.py 51--- Python-2.7.14.orig/Lib/pydoc.py
52+++ Python-2.7.13/Lib/pydoc.py 52+++ Python-2.7.14/Lib/pydoc.py
53@@ -375,7 +375,7 @@ class Doc: 53@@ -375,7 +375,7 @@ class Doc:
54 docmodule = docclass = docroutine = docother = docproperty = docdata = fail 54 docmodule = docclass = docroutine = docother = docproperty = docdata = fail
55 55
@@ -59,10 +59,10 @@ Index: Python-2.7.13/Lib/pydoc.py
59 "python"+sys.version[0:3])): 59 "python"+sys.version[0:3])):
60 """Return the location of module docs or None""" 60 """Return the location of module docs or None"""
61 61
62Index: Python-2.7.13/Lib/site.py 62Index: Python-2.7.14/Lib/site.py
63=================================================================== 63===================================================================
64--- Python-2.7.13.orig/Lib/site.py 64--- Python-2.7.14.orig/Lib/site.py
65+++ Python-2.7.13/Lib/site.py 65+++ Python-2.7.14/Lib/site.py
66@@ -288,13 +288,19 @@ def getsitepackages(): 66@@ -288,13 +288,19 @@ def getsitepackages():
67 if sys.platform in ('os2emx', 'riscos'): 67 if sys.platform in ('os2emx', 'riscos'):
68 sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) 68 sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
@@ -86,10 +86,10 @@ Index: Python-2.7.13/Lib/site.py
86 return sitepackages 86 return sitepackages
87 87
88 def addsitepackages(known_paths): 88 def addsitepackages(known_paths):
89Index: Python-2.7.13/Lib/test/test_dl.py 89Index: Python-2.7.14/Lib/test/test_dl.py
90=================================================================== 90===================================================================
91--- Python-2.7.13.orig/Lib/test/test_dl.py 91--- Python-2.7.14.orig/Lib/test/test_dl.py
92+++ Python-2.7.13/Lib/test/test_dl.py 92+++ Python-2.7.14/Lib/test/test_dl.py
93@@ -4,10 +4,11 @@ 93@@ -4,10 +4,11 @@
94 import unittest 94 import unittest
95 from test.test_support import verbose, import_module 95 from test.test_support import verbose, import_module
@@ -104,10 +104,10 @@ Index: Python-2.7.13/Lib/test/test_dl.py
104 ('/usr/bin/cygwin1.dll', 'getpid'), 104 ('/usr/bin/cygwin1.dll', 'getpid'),
105 ('/usr/lib/libc.dylib', 'getpid'), 105 ('/usr/lib/libc.dylib', 'getpid'),
106 ] 106 ]
107Index: Python-2.7.13/Lib/trace.py 107Index: Python-2.7.14/Lib/trace.py
108=================================================================== 108===================================================================
109--- Python-2.7.13.orig/Lib/trace.py 109--- Python-2.7.14.orig/Lib/trace.py
110+++ Python-2.7.13/Lib/trace.py 110+++ Python-2.7.14/Lib/trace.py
111@@ -754,10 +754,10 @@ def main(argv=None): 111@@ -754,10 +754,10 @@ def main(argv=None):
112 # should I also call expanduser? (after all, could use $HOME) 112 # should I also call expanduser? (after all, could use $HOME)
113 113
@@ -121,11 +121,11 @@ Index: Python-2.7.13/Lib/trace.py
121 "python" + sys.version[:3])) 121 "python" + sys.version[:3]))
122 s = os.path.normpath(s) 122 s = os.path.normpath(s)
123 ignore_dirs.append(s) 123 ignore_dirs.append(s)
124Index: Python-2.7.13/Makefile.pre.in 124Index: Python-2.7.14/Makefile.pre.in
125=================================================================== 125===================================================================
126--- Python-2.7.13.orig/Makefile.pre.in 126--- Python-2.7.14.orig/Makefile.pre.in
127+++ Python-2.7.13/Makefile.pre.in 127+++ Python-2.7.14/Makefile.pre.in
128@@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG 128@@ -91,6 +91,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
129 129
130 # Machine-dependent subdirectories 130 # Machine-dependent subdirectories
131 MACHDEP= @MACHDEP@ 131 MACHDEP= @MACHDEP@
@@ -133,7 +133,7 @@ Index: Python-2.7.13/Makefile.pre.in
133 133
134 # Multiarch directory (may be empty) 134 # Multiarch directory (may be empty)
135 MULTIARCH= @MULTIARCH@ 135 MULTIARCH= @MULTIARCH@
136@@ -111,7 +112,7 @@ LIBDIR= @libdir@ 136@@ -110,7 +111,7 @@ LIBDIR= @libdir@
137 MANDIR= @mandir@ 137 MANDIR= @mandir@
138 INCLUDEDIR= @includedir@ 138 INCLUDEDIR= @includedir@
139 CONFINCLUDEDIR= $(exec_prefix)/include 139 CONFINCLUDEDIR= $(exec_prefix)/include
@@ -142,7 +142,7 @@ Index: Python-2.7.13/Makefile.pre.in
142 142
143 # Detailed destination directories 143 # Detailed destination directories
144 BINLIBDEST= $(LIBDIR)/python$(VERSION) 144 BINLIBDEST= $(LIBDIR)/python$(VERSION)
145@@ -668,6 +669,7 @@ Modules/getpath.o: $(srcdir)/Modules/get 145@@ -644,6 +645,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
146 -DEXEC_PREFIX='"$(exec_prefix)"' \ 146 -DEXEC_PREFIX='"$(exec_prefix)"' \
147 -DVERSION='"$(VERSION)"' \ 147 -DVERSION='"$(VERSION)"' \
148 -DVPATH='"$(VPATH)"' \ 148 -DVPATH='"$(VPATH)"' \
@@ -150,8 +150,8 @@ Index: Python-2.7.13/Makefile.pre.in
150 -o $@ $(srcdir)/Modules/getpath.c 150 -o $@ $(srcdir)/Modules/getpath.c
151 151
152 Modules/python.o: $(srcdir)/Modules/python.c 152 Modules/python.o: $(srcdir)/Modules/python.c
153@@ -708,7 +710,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) 153@@ -692,7 +694,7 @@ regen-ast:
154 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) 154 Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h
155 155
156 Python/getplatform.o: $(srcdir)/Python/getplatform.c 156 Python/getplatform.o: $(srcdir)/Python/getplatform.c
157- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c 157- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
@@ -159,10 +159,10 @@ Index: Python-2.7.13/Makefile.pre.in
159 159
160 Python/importdl.o: $(srcdir)/Python/importdl.c 160 Python/importdl.o: $(srcdir)/Python/importdl.c
161 $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c 161 $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
162Index: Python-2.7.13/Modules/getpath.c 162Index: Python-2.7.14/Modules/getpath.c
163=================================================================== 163===================================================================
164--- Python-2.7.13.orig/Modules/getpath.c 164--- Python-2.7.14.orig/Modules/getpath.c
165+++ Python-2.7.13/Modules/getpath.c 165+++ Python-2.7.14/Modules/getpath.c
166@@ -100,6 +100,13 @@ 166@@ -100,6 +100,13 @@
167 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" 167 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
168 #endif 168 #endif
@@ -186,10 +186,10 @@ Index: Python-2.7.13/Modules/getpath.c
186 186
187 static void 187 static void
188 reduce(char *dir) 188 reduce(char *dir)
189Index: Python-2.7.13/Python/getplatform.c 189Index: Python-2.7.14/Python/getplatform.c
190=================================================================== 190===================================================================
191--- Python-2.7.13.orig/Python/getplatform.c 191--- Python-2.7.14.orig/Python/getplatform.c
192+++ Python-2.7.13/Python/getplatform.c 192+++ Python-2.7.14/Python/getplatform.c
193@@ -10,3 +10,13 @@ Py_GetPlatform(void) 193@@ -10,3 +10,13 @@ Py_GetPlatform(void)
194 { 194 {
195 return PLATFORM; 195 return PLATFORM;
@@ -204,10 +204,10 @@ Index: Python-2.7.13/Python/getplatform.c
204+{ 204+{
205+ return LIB; 205+ return LIB;
206+} 206+}
207Index: Python-2.7.13/Python/sysmodule.c 207Index: Python-2.7.14/Python/sysmodule.c
208=================================================================== 208===================================================================
209--- Python-2.7.13.orig/Python/sysmodule.c 209--- Python-2.7.14.orig/Python/sysmodule.c
210+++ Python-2.7.13/Python/sysmodule.c 210+++ Python-2.7.14/Python/sysmodule.c
211@@ -1437,6 +1437,8 @@ _PySys_Init(void) 211@@ -1437,6 +1437,8 @@ _PySys_Init(void)
212 PyString_FromString(Py_GetCopyright())); 212 PyString_FromString(Py_GetCopyright()));
213 SET_SYS_FROM_STRING("platform", 213 SET_SYS_FROM_STRING("platform",
@@ -217,11 +217,11 @@ Index: Python-2.7.13/Python/sysmodule.c
217 SET_SYS_FROM_STRING("executable", 217 SET_SYS_FROM_STRING("executable",
218 PyString_FromString(Py_GetProgramFullPath())); 218 PyString_FromString(Py_GetProgramFullPath()));
219 SET_SYS_FROM_STRING("prefix", 219 SET_SYS_FROM_STRING("prefix",
220Index: Python-2.7.13/configure.ac 220Index: Python-2.7.14/configure.ac
221=================================================================== 221===================================================================
222--- Python-2.7.13.orig/configure.ac 222--- Python-2.7.14.orig/configure.ac
223+++ Python-2.7.13/configure.ac 223+++ Python-2.7.14/configure.ac
224@@ -759,6 +759,11 @@ SunOS*) 224@@ -758,6 +758,11 @@ SunOS*)
225 ;; 225 ;;
226 esac 226 esac
227 227
diff --git a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
index 506debaf76..329734064b 100644
--- a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
+++ b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
@@ -13,16 +13,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
13 configure.ac | 2 +- 13 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16Index: Python-2.7.13/configure.ac 16Index: Python-2.7.14/configure.ac
17=================================================================== 17===================================================================
18--- Python-2.7.13.orig/configure.ac 18--- Python-2.7.14.orig/configure.ac
19+++ Python-2.7.13/configure.ac 19+++ Python-2.7.14/configure.ac
20@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then 20@@ -36,7 +36,7 @@ if test "$cross_compiling" = yes; then
21 AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) 21 AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
22 fi 22 fi
23 AC_MSG_RESULT($interp) 23 AC_MSG_RESULT($interp)
24- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp 24- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
25+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp 25+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
26 fi 26 fi
27 # Used to comment out stuff for rebuilding generated files 27 elif test "$cross_compiling" = maybe; then
28 GENERATED_COMMENT='#' 28 AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
diff --git a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch b/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch
index 90dcd57c04..60d782cd26 100644
--- a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch
+++ b/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch
@@ -4,12 +4,13 @@ cross-compiled.
4Signed-off-by: Tudor Florea <tudor.florea@enea.com> 4Signed-off-by: Tudor Florea <tudor.florea@enea.com>
5Upstream-Status: Pending 5Upstream-Status: Pending
6--- 6---
7diff -ruN a/Makefile.pre.in b/Makefile.pre.in 7Index: Python-2.7.14/Makefile.pre.in
8--- a/Makefile.pre.in 2013-06-27 10:44:11.033840532 +0200 8===================================================================
9+++ b/Makefile.pre.in 2013-06-27 10:44:39.572635273 +0200 9--- Python-2.7.14.orig/Makefile.pre.in
10@@ -709,14 +709,19 @@ 10+++ Python-2.7.14/Makefile.pre.in
11 # generated bytecode. This is sometimes a very shy bug needing a lot of 11@@ -846,14 +846,19 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
12 # sample data. 12
13 .PHONY: test testall testuniversal buildbottest pythoninfo
13 14
14-TESTOPTS= -l $(EXTRATESTOPTS) 15-TESTOPTS= -l $(EXTRATESTOPTS)
15+TESTOPTS= -l -v $(EXTRATESTOPTS) 16+TESTOPTS= -l -v $(EXTRATESTOPTS)
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch
index 94fdfeb630..1116dd518e 100644
--- a/meta/recipes-devtools/python/python/multilib.patch
+++ b/meta/recipes-devtools/python/python/multilib.patch
@@ -1,11 +1,11 @@
1Rebased for python-2.7.9 1Rebased for python-2.7.9
2Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> 2Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
3Upstream-Status: Pending 3Upstream-Status: Pending
4Index: Python-2.7.13/configure.ac 4Index: Python-2.7.14/configure.ac
5=================================================================== 5===================================================================
6--- Python-2.7.13.orig/configure.ac 6--- Python-2.7.14.orig/configure.ac
7+++ Python-2.7.13/configure.ac 7+++ Python-2.7.14/configure.ac
8@@ -759,6 +759,10 @@ SunOS*) 8@@ -758,6 +758,10 @@ SunOS*)
9 ;; 9 ;;
10 esac 10 esac
11 11
@@ -16,10 +16,10 @@ Index: Python-2.7.13/configure.ac
16 16
17 AC_SUBST(LIBRARY) 17 AC_SUBST(LIBRARY)
18 AC_MSG_CHECKING(LIBRARY) 18 AC_MSG_CHECKING(LIBRARY)
19Index: Python-2.7.13/Include/pythonrun.h 19Index: Python-2.7.14/Include/pythonrun.h
20=================================================================== 20===================================================================
21--- Python-2.7.13.orig/Include/pythonrun.h 21--- Python-2.7.14.orig/Include/pythonrun.h
22+++ Python-2.7.13/Include/pythonrun.h 22+++ Python-2.7.14/Include/pythonrun.h
23@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); 23@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void);
24 /* In their own files */ 24 /* In their own files */
25 PyAPI_FUNC(const char *) Py_GetVersion(void); 25 PyAPI_FUNC(const char *) Py_GetVersion(void);
@@ -28,10 +28,10 @@ Index: Python-2.7.13/Include/pythonrun.h
28 PyAPI_FUNC(const char *) Py_GetCopyright(void); 28 PyAPI_FUNC(const char *) Py_GetCopyright(void);
29 PyAPI_FUNC(const char *) Py_GetCompiler(void); 29 PyAPI_FUNC(const char *) Py_GetCompiler(void);
30 PyAPI_FUNC(const char *) Py_GetBuildInfo(void); 30 PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
31Index: Python-2.7.13/Lib/distutils/command/install.py 31Index: Python-2.7.14/Lib/distutils/command/install.py
32=================================================================== 32===================================================================
33--- Python-2.7.13.orig/Lib/distutils/command/install.py 33--- Python-2.7.14.orig/Lib/distutils/command/install.py
34+++ Python-2.7.13/Lib/distutils/command/install.py 34+++ Python-2.7.14/Lib/distutils/command/install.py
35@@ -22,6 +22,8 @@ from site import USER_BASE 35@@ -22,6 +22,8 @@ from site import USER_BASE
36 from site import USER_SITE 36 from site import USER_SITE
37 37
@@ -52,10 +52,10 @@ Index: Python-2.7.13/Lib/distutils/command/install.py
52 'headers': '$base/include/python$py_version_short/$dist_name', 52 'headers': '$base/include/python$py_version_short/$dist_name',
53 'scripts': '$base/bin', 53 'scripts': '$base/bin',
54 'data' : '$base', 54 'data' : '$base',
55Index: Python-2.7.13/Lib/distutils/sysconfig.py 55Index: Python-2.7.14/Lib/distutils/sysconfig.py
56=================================================================== 56===================================================================
57--- Python-2.7.13.orig/Lib/distutils/sysconfig.py 57--- Python-2.7.14.orig/Lib/distutils/sysconfig.py
58+++ Python-2.7.13/Lib/distutils/sysconfig.py 58+++ Python-2.7.14/Lib/distutils/sysconfig.py
59@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan 59@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan
60 prefix = plat_specific and EXEC_PREFIX or PREFIX 60 prefix = plat_specific and EXEC_PREFIX or PREFIX
61 61
@@ -70,10 +70,10 @@ Index: Python-2.7.13/Lib/distutils/sysconfig.py
70 if standard_lib: 70 if standard_lib:
71 return libpython 71 return libpython
72 else: 72 else:
73Index: Python-2.7.13/Lib/pydoc.py 73Index: Python-2.7.14/Lib/pydoc.py
74=================================================================== 74===================================================================
75--- Python-2.7.13.orig/Lib/pydoc.py 75--- Python-2.7.14.orig/Lib/pydoc.py
76+++ Python-2.7.13/Lib/pydoc.py 76+++ Python-2.7.14/Lib/pydoc.py
77@@ -375,7 +375,7 @@ class Doc: 77@@ -375,7 +375,7 @@ class Doc:
78 docmodule = docclass = docroutine = docother = docproperty = docdata = fail 78 docmodule = docclass = docroutine = docother = docproperty = docdata = fail
79 79
@@ -83,10 +83,10 @@ Index: Python-2.7.13/Lib/pydoc.py
83 "python"+sys.version[0:3])): 83 "python"+sys.version[0:3])):
84 """Return the location of module docs or None""" 84 """Return the location of module docs or None"""
85 85
86Index: Python-2.7.13/Lib/site.py 86Index: Python-2.7.14/Lib/site.py
87=================================================================== 87===================================================================
88--- Python-2.7.13.orig/Lib/site.py 88--- Python-2.7.14.orig/Lib/site.py
89+++ Python-2.7.13/Lib/site.py 89+++ Python-2.7.14/Lib/site.py
90@@ -288,13 +288,18 @@ def getsitepackages(): 90@@ -288,13 +288,18 @@ def getsitepackages():
91 if sys.platform in ('os2emx', 'riscos'): 91 if sys.platform in ('os2emx', 'riscos'):
92 sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) 92 sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
@@ -109,10 +109,10 @@ Index: Python-2.7.13/Lib/site.py
109 return sitepackages 109 return sitepackages
110 110
111 def addsitepackages(known_paths): 111 def addsitepackages(known_paths):
112Index: Python-2.7.13/Lib/sysconfig.py 112Index: Python-2.7.14/Lib/sysconfig.py
113=================================================================== 113===================================================================
114--- Python-2.7.13.orig/Lib/sysconfig.py 114--- Python-2.7.14.orig/Lib/sysconfig.py
115+++ Python-2.7.13/Lib/sysconfig.py 115+++ Python-2.7.14/Lib/sysconfig.py
116@@ -7,10 +7,10 @@ from os.path import pardir, realpath 116@@ -7,10 +7,10 @@ from os.path import pardir, realpath
117 117
118 _INSTALL_SCHEMES = { 118 _INSTALL_SCHEMES = {
@@ -141,10 +141,10 @@ Index: Python-2.7.13/Lib/sysconfig.py
141 'include': '{userbase}/include/python{py_version_short}', 141 'include': '{userbase}/include/python{py_version_short}',
142 'scripts': '{userbase}/bin', 142 'scripts': '{userbase}/bin',
143 'data' : '{userbase}', 143 'data' : '{userbase}',
144Index: Python-2.7.13/Lib/test/test_dl.py 144Index: Python-2.7.14/Lib/test/test_dl.py
145=================================================================== 145===================================================================
146--- Python-2.7.13.orig/Lib/test/test_dl.py 146--- Python-2.7.14.orig/Lib/test/test_dl.py
147+++ Python-2.7.13/Lib/test/test_dl.py 147+++ Python-2.7.14/Lib/test/test_dl.py
148@@ -4,10 +4,11 @@ 148@@ -4,10 +4,11 @@
149 import unittest 149 import unittest
150 from test.test_support import verbose, import_module 150 from test.test_support import verbose, import_module
@@ -159,11 +159,11 @@ Index: Python-2.7.13/Lib/test/test_dl.py
159 ('/usr/bin/cygwin1.dll', 'getpid'), 159 ('/usr/bin/cygwin1.dll', 'getpid'),
160 ('/usr/lib/libc.dylib', 'getpid'), 160 ('/usr/lib/libc.dylib', 'getpid'),
161 ] 161 ]
162Index: Python-2.7.13/Lib/test/test_site.py 162Index: Python-2.7.14/Lib/test/test_site.py
163=================================================================== 163===================================================================
164--- Python-2.7.13.orig/Lib/test/test_site.py 164--- Python-2.7.14.orig/Lib/test/test_site.py
165+++ Python-2.7.13/Lib/test/test_site.py 165+++ Python-2.7.14/Lib/test/test_site.py
166@@ -235,12 +235,16 @@ class HelperFunctionsTests(unittest.Test 166@@ -252,12 +252,16 @@ class HelperFunctionsTests(unittest.Test
167 self.assertEqual(dirs[0], wanted) 167 self.assertEqual(dirs[0], wanted)
168 elif os.sep == '/': 168 elif os.sep == '/':
169 # OS X, Linux, FreeBSD, etc 169 # OS X, Linux, FreeBSD, etc
@@ -183,10 +183,10 @@ Index: Python-2.7.13/Lib/test/test_site.py
183 else: 183 else:
184 # other platforms 184 # other platforms
185 self.assertEqual(len(dirs), 2) 185 self.assertEqual(len(dirs), 2)
186Index: Python-2.7.13/Lib/trace.py 186Index: Python-2.7.14/Lib/trace.py
187=================================================================== 187===================================================================
188--- Python-2.7.13.orig/Lib/trace.py 188--- Python-2.7.14.orig/Lib/trace.py
189+++ Python-2.7.13/Lib/trace.py 189+++ Python-2.7.14/Lib/trace.py
190@@ -754,10 +754,10 @@ def main(argv=None): 190@@ -754,10 +754,10 @@ def main(argv=None):
191 # should I also call expanduser? (after all, could use $HOME) 191 # should I also call expanduser? (after all, could use $HOME)
192 192
@@ -200,11 +200,11 @@ Index: Python-2.7.13/Lib/trace.py
200 "python" + sys.version[:3])) 200 "python" + sys.version[:3]))
201 s = os.path.normpath(s) 201 s = os.path.normpath(s)
202 ignore_dirs.append(s) 202 ignore_dirs.append(s)
203Index: Python-2.7.13/Makefile.pre.in 203Index: Python-2.7.14/Makefile.pre.in
204=================================================================== 204===================================================================
205--- Python-2.7.13.orig/Makefile.pre.in 205--- Python-2.7.14.orig/Makefile.pre.in
206+++ Python-2.7.13/Makefile.pre.in 206+++ Python-2.7.14/Makefile.pre.in
207@@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG 207@@ -91,6 +91,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
208 208
209 # Machine-dependent subdirectories 209 # Machine-dependent subdirectories
210 MACHDEP= @MACHDEP@ 210 MACHDEP= @MACHDEP@
@@ -212,7 +212,7 @@ Index: Python-2.7.13/Makefile.pre.in
212 212
213 # Multiarch directory (may be empty) 213 # Multiarch directory (may be empty)
214 MULTIARCH= @MULTIARCH@ 214 MULTIARCH= @MULTIARCH@
215@@ -111,7 +112,7 @@ LIBDIR= @libdir@ 215@@ -110,7 +111,7 @@ LIBDIR= @libdir@
216 MANDIR= @mandir@ 216 MANDIR= @mandir@
217 INCLUDEDIR= @includedir@ 217 INCLUDEDIR= @includedir@
218 CONFINCLUDEDIR= $(exec_prefix)/include 218 CONFINCLUDEDIR= $(exec_prefix)/include
@@ -221,7 +221,7 @@ Index: Python-2.7.13/Makefile.pre.in
221 221
222 # Detailed destination directories 222 # Detailed destination directories
223 BINLIBDEST= $(LIBDIR)/python$(VERSION) 223 BINLIBDEST= $(LIBDIR)/python$(VERSION)
224@@ -669,6 +670,7 @@ Modules/getpath.o: $(srcdir)/Modules/get 224@@ -645,6 +646,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
225 -DEXEC_PREFIX='"$(exec_prefix)"' \ 225 -DEXEC_PREFIX='"$(exec_prefix)"' \
226 -DVERSION='"$(VERSION)"' \ 226 -DVERSION='"$(VERSION)"' \
227 -DVPATH='"$(VPATH)"' \ 227 -DVPATH='"$(VPATH)"' \
@@ -229,8 +229,8 @@ Index: Python-2.7.13/Makefile.pre.in
229 -o $@ $(srcdir)/Modules/getpath.c 229 -o $@ $(srcdir)/Modules/getpath.c
230 230
231 Modules/python.o: $(srcdir)/Modules/python.c 231 Modules/python.o: $(srcdir)/Modules/python.c
232@@ -709,7 +711,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) 232@@ -693,7 +695,7 @@ regen-ast:
233 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) 233 Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h
234 234
235 Python/getplatform.o: $(srcdir)/Python/getplatform.c 235 Python/getplatform.o: $(srcdir)/Python/getplatform.c
236- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c 236- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
@@ -238,10 +238,10 @@ Index: Python-2.7.13/Makefile.pre.in
238 238
239 Python/importdl.o: $(srcdir)/Python/importdl.c 239 Python/importdl.o: $(srcdir)/Python/importdl.c
240 $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c 240 $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
241Index: Python-2.7.13/Modules/getpath.c 241Index: Python-2.7.14/Modules/getpath.c
242=================================================================== 242===================================================================
243--- Python-2.7.13.orig/Modules/getpath.c 243--- Python-2.7.14.orig/Modules/getpath.c
244+++ Python-2.7.13/Modules/getpath.c 244+++ Python-2.7.14/Modules/getpath.c
245@@ -100,6 +100,13 @@ 245@@ -100,6 +100,13 @@
246 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" 246 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
247 #endif 247 #endif
@@ -265,10 +265,10 @@ Index: Python-2.7.13/Modules/getpath.c
265 265
266 static void 266 static void
267 reduce(char *dir) 267 reduce(char *dir)
268Index: Python-2.7.13/Python/getplatform.c 268Index: Python-2.7.14/Python/getplatform.c
269=================================================================== 269===================================================================
270--- Python-2.7.13.orig/Python/getplatform.c 270--- Python-2.7.14.orig/Python/getplatform.c
271+++ Python-2.7.13/Python/getplatform.c 271+++ Python-2.7.14/Python/getplatform.c
272@@ -10,3 +10,13 @@ Py_GetPlatform(void) 272@@ -10,3 +10,13 @@ Py_GetPlatform(void)
273 { 273 {
274 return PLATFORM; 274 return PLATFORM;
@@ -283,10 +283,10 @@ Index: Python-2.7.13/Python/getplatform.c
283+{ 283+{
284+ return LIB; 284+ return LIB;
285+} 285+}
286Index: Python-2.7.13/Python/sysmodule.c 286Index: Python-2.7.14/Python/sysmodule.c
287=================================================================== 287===================================================================
288--- Python-2.7.13.orig/Python/sysmodule.c 288--- Python-2.7.14.orig/Python/sysmodule.c
289+++ Python-2.7.13/Python/sysmodule.c 289+++ Python-2.7.14/Python/sysmodule.c
290@@ -1437,6 +1437,8 @@ _PySys_Init(void) 290@@ -1437,6 +1437,8 @@ _PySys_Init(void)
291 PyString_FromString(Py_GetCopyright())); 291 PyString_FromString(Py_GetCopyright()));
292 SET_SYS_FROM_STRING("platform", 292 SET_SYS_FROM_STRING("platform",
diff --git a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
index 08c4403cbf..77da6159c9 100644
--- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
+++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
@@ -25,10 +25,10 @@ Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
25 setup.py | 9 ++++----- 25 setup.py | 9 ++++-----
26 12 files changed, 97 insertions(+), 23 deletions(-) 26 12 files changed, 97 insertions(+), 23 deletions(-)
27 27
28diff --git a/Include/pythonrun.h b/Include/pythonrun.h 28Index: Python-3.5.4/Include/pythonrun.h
29index 9c2e813..2f79cb6 100644 29===================================================================
30--- a/Include/pythonrun.h 30--- Python-3.5.4.orig/Include/pythonrun.h
31+++ b/Include/pythonrun.h 31+++ Python-3.5.4/Include/pythonrun.h
32@@ -23,6 +23,9 @@ typedef struct { 32@@ -23,6 +23,9 @@ typedef struct {
33 } PyCompilerFlags; 33 } PyCompilerFlags;
34 #endif 34 #endif
@@ -39,10 +39,10 @@ index 9c2e813..2f79cb6 100644
39 #ifndef Py_LIMITED_API 39 #ifndef Py_LIMITED_API
40 PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); 40 PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
41 PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); 41 PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
42diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py 42Index: Python-3.5.4/Lib/distutils/command/install.py
43index 67db007..b46b45b 100644 43===================================================================
44--- a/Lib/distutils/command/install.py 44--- Python-3.5.4.orig/Lib/distutils/command/install.py
45+++ b/Lib/distutils/command/install.py 45+++ Python-3.5.4/Lib/distutils/command/install.py
46@@ -19,6 +19,8 @@ from site import USER_BASE 46@@ -19,6 +19,8 @@ from site import USER_BASE
47 from site import USER_SITE 47 from site import USER_SITE
48 HAS_USER_SITE = True 48 HAS_USER_SITE = True
@@ -61,11 +61,11 @@ index 67db007..b46b45b 100644
61 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', 61 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
62 'scripts': '$base/bin', 62 'scripts': '$base/bin',
63 'data' : '$base', 63 'data' : '$base',
64diff --git a/Lib/pydoc.py b/Lib/pydoc.py 64Index: Python-3.5.4/Lib/pydoc.py
65index 3ca08c9..6528730 100755 65===================================================================
66--- a/Lib/pydoc.py 66--- Python-3.5.4.orig/Lib/pydoc.py
67+++ b/Lib/pydoc.py 67+++ Python-3.5.4/Lib/pydoc.py
68@@ -384,7 +384,7 @@ class Doc: 68@@ -389,7 +389,7 @@ class Doc:
69 docmodule = docclass = docroutine = docother = docproperty = docdata = fail 69 docmodule = docclass = docroutine = docother = docproperty = docdata = fail
70 70
71 def getdocloc(self, object, 71 def getdocloc(self, object,
@@ -74,10 +74,10 @@ index 3ca08c9..6528730 100755
74 "python%d.%d" % sys.version_info[:2])): 74 "python%d.%d" % sys.version_info[:2])):
75 """Return the location of module docs or None""" 75 """Return the location of module docs or None"""
76 76
77diff --git a/Lib/site.py b/Lib/site.py 77Index: Python-3.5.4/Lib/site.py
78index 3f78ef5..511931e 100644 78===================================================================
79--- a/Lib/site.py 79--- Python-3.5.4.orig/Lib/site.py
80+++ b/Lib/site.py 80+++ Python-3.5.4/Lib/site.py
81@@ -303,12 +303,12 @@ def getsitepackages(prefixes=None): 81@@ -303,12 +303,12 @@ def getsitepackages(prefixes=None):
82 seen.add(prefix) 82 seen.add(prefix)
83 83
@@ -93,10 +93,10 @@ index 3f78ef5..511931e 100644
93 if sys.platform == "darwin": 93 if sys.platform == "darwin":
94 # for framework builds *only* we add the standard Apple 94 # for framework builds *only* we add the standard Apple
95 # locations. 95 # locations.
96diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py 96Index: Python-3.5.4/Lib/sysconfig.py
97index 9c34be0..3d1181a 100644 97===================================================================
98--- a/Lib/sysconfig.py 98--- Python-3.5.4.orig/Lib/sysconfig.py
99+++ b/Lib/sysconfig.py 99+++ Python-3.5.4/Lib/sysconfig.py
100@@ -20,10 +20,10 @@ __all__ = [ 100@@ -20,10 +20,10 @@ __all__ = [
101 101
102 _INSTALL_SCHEMES = { 102 _INSTALL_SCHEMES = {
@@ -139,10 +139,10 @@ index 9c34be0..3d1181a 100644
139 'include': '{userbase}/include/python{py_version_short}', 139 'include': '{userbase}/include/python{py_version_short}',
140 'scripts': '{userbase}/bin', 140 'scripts': '{userbase}/bin',
141 'data': '{userbase}', 141 'data': '{userbase}',
142diff --git a/Lib/trace.py b/Lib/trace.py 142Index: Python-3.5.4/Lib/trace.py
143index f108266..7fd83f2 100755 143===================================================================
144--- a/Lib/trace.py 144--- Python-3.5.4.orig/Lib/trace.py
145+++ b/Lib/trace.py 145+++ Python-3.5.4/Lib/trace.py
146@@ -749,10 +749,10 @@ def main(argv=None): 146@@ -749,10 +749,10 @@ def main(argv=None):
147 # should I also call expanduser? (after all, could use $HOME) 147 # should I also call expanduser? (after all, could use $HOME)
148 148
@@ -156,11 +156,11 @@ index f108266..7fd83f2 100755
156 "python" + sys.version[:3])) 156 "python" + sys.version[:3]))
157 s = os.path.normpath(s) 157 s = os.path.normpath(s)
158 ignore_dirs.append(s) 158 ignore_dirs.append(s)
159diff --git a/Makefile.pre.in b/Makefile.pre.in 159Index: Python-3.5.4/Makefile.pre.in
160index 109f402..61a41e2 100644 160===================================================================
161--- a/Makefile.pre.in 161--- Python-3.5.4.orig/Makefile.pre.in
162+++ b/Makefile.pre.in 162+++ Python-3.5.4/Makefile.pre.in
163@@ -106,6 +106,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARE 163@@ -109,6 +109,8 @@ CFLAGS_ALIASING=@CFLAGS_ALIASING@
164 164
165 # Machine-dependent subdirectories 165 # Machine-dependent subdirectories
166 MACHDEP= @MACHDEP@ 166 MACHDEP= @MACHDEP@
@@ -169,7 +169,7 @@ index 109f402..61a41e2 100644
169 169
170 # Multiarch directory (may be empty) 170 # Multiarch directory (may be empty)
171 MULTIARCH= @MULTIARCH@ 171 MULTIARCH= @MULTIARCH@
172@@ -125,7 +127,7 @@ LIBDIR= @libdir@ 172@@ -128,7 +130,7 @@ LIBDIR= @libdir@
173 MANDIR= @mandir@ 173 MANDIR= @mandir@
174 INCLUDEDIR= @includedir@ 174 INCLUDEDIR= @includedir@
175 CONFINCLUDEDIR= $(exec_prefix)/include 175 CONFINCLUDEDIR= $(exec_prefix)/include
@@ -178,7 +178,7 @@ index 109f402..61a41e2 100644
178 ABIFLAGS= @ABIFLAGS@ 178 ABIFLAGS= @ABIFLAGS@
179 179
180 # Detailed destination directories 180 # Detailed destination directories
181@@ -755,6 +757,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile 181@@ -731,6 +733,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
182 -DEXEC_PREFIX='"$(exec_prefix)"' \ 182 -DEXEC_PREFIX='"$(exec_prefix)"' \
183 -DVERSION='"$(VERSION)"' \ 183 -DVERSION='"$(VERSION)"' \
184 -DVPATH='"$(VPATH)"' \ 184 -DVPATH='"$(VPATH)"' \
@@ -186,8 +186,8 @@ index 109f402..61a41e2 100644
186 -o $@ $(srcdir)/Modules/getpath.c 186 -o $@ $(srcdir)/Modules/getpath.c
187 187
188 Programs/python.o: $(srcdir)/Programs/python.c 188 Programs/python.o: $(srcdir)/Programs/python.c
189@@ -835,7 +838,7 @@ $(OPCODE_H): $(srcdir)/Lib/opcode.py $(OPCODE_H_SCRIPT) 189@@ -813,7 +816,7 @@ regen-opcode:
190 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) 190 Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h
191 191
192 Python/getplatform.o: $(srcdir)/Python/getplatform.c 192 Python/getplatform.o: $(srcdir)/Python/getplatform.c
193- $(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c 193- $(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
@@ -195,10 +195,10 @@ index 109f402..61a41e2 100644
195 195
196 Python/importdl.o: $(srcdir)/Python/importdl.c 196 Python/importdl.o: $(srcdir)/Python/importdl.c
197 $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c 197 $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
198diff --git a/Modules/getpath.c b/Modules/getpath.c 198Index: Python-3.5.4/Modules/getpath.c
199index 18deb60..a01c3f8 100644 199===================================================================
200--- a/Modules/getpath.c 200--- Python-3.5.4.orig/Modules/getpath.c
201+++ b/Modules/getpath.c 201+++ Python-3.5.4/Modules/getpath.c
202@@ -105,6 +105,13 @@ 202@@ -105,6 +105,13 @@
203 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" 203 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
204 #endif 204 #endif
@@ -230,10 +230,10 @@ index 18deb60..a01c3f8 100644
230 230
231 if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { 231 if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
232 Py_FatalError( 232 Py_FatalError(
233diff --git a/Python/getplatform.c b/Python/getplatform.c 233Index: Python-3.5.4/Python/getplatform.c
234index 6899140..66a49c6 100644 234===================================================================
235--- a/Python/getplatform.c 235--- Python-3.5.4.orig/Python/getplatform.c
236+++ b/Python/getplatform.c 236+++ Python-3.5.4/Python/getplatform.c
237@@ -10,3 +10,23 @@ Py_GetPlatform(void) 237@@ -10,3 +10,23 @@ Py_GetPlatform(void)
238 { 238 {
239 return PLATFORM; 239 return PLATFORM;
@@ -258,11 +258,11 @@ index 6899140..66a49c6 100644
258+{ 258+{
259+ return LIB; 259+ return LIB;
260+} 260+}
261diff --git a/Python/sysmodule.c b/Python/sysmodule.c 261Index: Python-3.5.4/Python/sysmodule.c
262index 8d7e05a..d9dee0f 100644 262===================================================================
263--- a/Python/sysmodule.c 263--- Python-3.5.4.orig/Python/sysmodule.c
264+++ b/Python/sysmodule.c 264+++ Python-3.5.4/Python/sysmodule.c
265@@ -1790,6 +1790,10 @@ _PySys_Init(void) 265@@ -1827,6 +1827,10 @@ _PySys_Init(void)
266 PyUnicode_FromString(Py_GetCopyright())); 266 PyUnicode_FromString(Py_GetCopyright()));
267 SET_SYS_FROM_STRING("platform", 267 SET_SYS_FROM_STRING("platform",
268 PyUnicode_FromString(Py_GetPlatform())); 268 PyUnicode_FromString(Py_GetPlatform()));
@@ -273,11 +273,11 @@ index 8d7e05a..d9dee0f 100644
273 SET_SYS_FROM_STRING("executable", 273 SET_SYS_FROM_STRING("executable",
274 PyUnicode_FromWideChar( 274 PyUnicode_FromWideChar(
275 Py_GetProgramFullPath(), -1)); 275 Py_GetProgramFullPath(), -1));
276diff --git a/configure.ac b/configure.ac 276Index: Python-3.5.4/configure.ac
277index 707324d..e8d59a3 100644 277===================================================================
278--- a/configure.ac 278--- Python-3.5.4.orig/configure.ac
279+++ b/configure.ac 279+++ Python-3.5.4/configure.ac
280@@ -883,6 +883,41 @@ PLATDIR=plat-$MACHDEP 280@@ -885,6 +885,41 @@ PLATDIR=plat-$MACHDEP
281 AC_SUBST(PLATDIR) 281 AC_SUBST(PLATDIR)
282 AC_SUBST(PLATFORM_TRIPLET) 282 AC_SUBST(PLATFORM_TRIPLET)
283 283
@@ -319,11 +319,11 @@ index 707324d..e8d59a3 100644
319 319
320 AC_MSG_CHECKING([for -Wl,--no-as-needed]) 320 AC_MSG_CHECKING([for -Wl,--no-as-needed])
321 save_LDFLAGS="$LDFLAGS" 321 save_LDFLAGS="$LDFLAGS"
322diff --git a/setup.py b/setup.py 322Index: Python-3.5.4/setup.py
323index 6d26deb..7b14215 100644 323===================================================================
324--- a/setup.py 324--- Python-3.5.4.orig/setup.py
325+++ b/setup.py 325+++ Python-3.5.4/setup.py
326@@ -495,7 +495,7 @@ class PyBuildExt(build_ext): 326@@ -494,7 +494,7 @@ class PyBuildExt(build_ext):
327 # directories (i.e. '.' and 'Include') must be first. See issue 327 # directories (i.e. '.' and 'Include') must be first. See issue
328 # 10520. 328 # 10520.
329 if not cross_compiling: 329 if not cross_compiling:
@@ -332,7 +332,7 @@ index 6d26deb..7b14215 100644
332 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 332 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
333 # only change this for cross builds for 3.3, issues on Mageia 333 # only change this for cross builds for 3.3, issues on Mageia
334 if cross_compiling: 334 if cross_compiling:
335@@ -553,8 +553,7 @@ class PyBuildExt(build_ext): 335@@ -552,8 +552,7 @@ class PyBuildExt(build_ext):
336 # be assumed that no additional -I,-L directives are needed. 336 # be assumed that no additional -I,-L directives are needed.
337 if not cross_compiling: 337 if not cross_compiling:
338 lib_dirs = self.compiler.library_dirs + [ 338 lib_dirs = self.compiler.library_dirs + [
@@ -342,7 +342,7 @@ index 6d26deb..7b14215 100644
342 ] 342 ]
343 inc_dirs = self.compiler.include_dirs + ['/usr/include'] 343 inc_dirs = self.compiler.include_dirs + ['/usr/include']
344 else: 344 else:
345@@ -746,11 +745,11 @@ class PyBuildExt(build_ext): 345@@ -745,11 +744,11 @@ class PyBuildExt(build_ext):
346 elif curses_library: 346 elif curses_library:
347 readline_libs.append(curses_library) 347 readline_libs.append(curses_library)
348 elif self.compiler.find_library_file(lib_dirs + 348 elif self.compiler.find_library_file(lib_dirs +
@@ -356,6 +356,3 @@ index 6d26deb..7b14215 100644
356 extra_link_args=readline_extra_link_args, 356 extra_link_args=readline_extra_link_args,
357 libraries=readline_libs) ) 357 libraries=readline_libs) )
358 else: 358 else:
359--
3602.11.0
361
diff --git a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
index 211f9e7889..a4f8bd4710 100644
--- a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
+++ b/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
@@ -10,16 +10,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
10 configure.ac | 2 +- 10 configure.ac | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13Index: Python-3.5.3/configure.ac 13Index: Python-3.5.4/configure.ac
14=================================================================== 14===================================================================
15--- Python-3.5.3.orig/configure.ac 15--- Python-3.5.4.orig/configure.ac
16+++ Python-3.5.3/configure.ac 16+++ Python-3.5.4/configure.ac
17@@ -78,7 +78,7 @@ if test "$cross_compiling" = yes; then 17@@ -73,7 +73,7 @@ if test "$cross_compiling" = yes; then
18 AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) 18 AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
19 fi 19 fi
20 AC_MSG_RESULT($interp) 20 AC_MSG_RESULT($interp)
21- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp 21- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
22+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH) '$interp 22+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH) '$interp
23 fi 23 fi
24 # Used to comment out stuff for rebuilding generated files 24 elif test "$cross_compiling" = maybe; then
25 GENERATED_COMMENT='#' 25 AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])