summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-08-03 18:49:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:30 +0100
commit3ab991bee2d7e1588e70c08005ca8d041fe63102 (patch)
tree0a15ae884c7a314ec545181bd6937ac8e9d94b53 /meta/recipes-devtools/python
parentadf4266524d0d1a7814d31496c3ecc6470644ec6 (diff)
downloadpoky-3ab991bee2d7e1588e70c08005ca8d041fe63102.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python3-native_3.5.2.bb (renamed from meta/recipes-devtools/python/python3-native_3.5.1.bb)7
-rw-r--r--meta/recipes-devtools/python/python3/000-cross-compile.patch38
-rw-r--r--meta/recipes-devtools/python/python3/python-3.3-multilib.patch116
3 files changed, 81 insertions, 80 deletions
diff --git a/meta/recipes-devtools/python/python3-native_3.5.1.bb b/meta/recipes-devtools/python/python3-native_3.5.2.bb
index 81ea087e88..061b5951d1 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.2.bb
@@ -26,10 +26,11 @@ file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
26file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ 26file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
27file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \ 27file://0001-Do-not-use-the-shell-version-of-python-config-that-w.patch \
28" 28"
29SRC_URI[md5sum] = "e9ea6f2623fffcdd871b7b19113fde80"
30SRC_URI[sha256sum] = "c6d57c0c366d9060ab6c0cdf889ebf3d92711d466cc0119c441dbf2746f725c9"
31 29
32LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" 30SRC_URI[md5sum] = "8906efbacfcdc7c3c9198aeefafd159e"
31SRC_URI[sha256sum] = "0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40"
32
33LIC_FILES_CHKSUM = "file://LICENSE;md5=6b60258130e4ed10d3101517eb5b9385"
33 34
34# exclude pre-releases for both python 2.x and 3.x 35# exclude pre-releases for both python 2.x and 3.x
35UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" 36UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
diff --git a/meta/recipes-devtools/python/python3/000-cross-compile.patch b/meta/recipes-devtools/python/python3/000-cross-compile.patch
index 28fe70adb3..2d822218f4 100644
--- a/meta/recipes-devtools/python/python3/000-cross-compile.patch
+++ b/meta/recipes-devtools/python/python3/000-cross-compile.patch
@@ -9,19 +9,19 @@ 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.1/Makefile.pre.in 12Index: Python-3.5.2/Makefile.pre.in
13=================================================================== 13===================================================================
14--- Python-3.5.1.orig/Makefile.pre.in 14--- Python-3.5.2.orig/Makefile.pre.in
15+++ Python-3.5.1/Makefile.pre.in 15+++ Python-3.5.2/Makefile.pre.in
16@@ -220,6 +220,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)
20+HOSTPYTHON= $(BUILDPYTHON) 20+HOSTPYTHON= $(BUILDPYTHON)
21 21
22 cross_compiling=@cross_compiling@
22 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ 23 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@
23 _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ 24@@ -279,6 +280,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,7 +29,7 @@ Index: Python-3.5.1/Makefile.pre.in
29 29
30 PSRCS= \ 30 PSRCS= \
31 Parser/acceler.c \ 31 Parser/acceler.c \
32@@ -506,7 +508,7 @@ build_all_generate_profile: 32@@ -509,7 +511,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
@@ -38,16 +38,16 @@ Index: Python-3.5.1/Makefile.pre.in
38 38
39 build_all_merge_profile: 39 build_all_merge_profile:
40 $(LLVM_PROF_MERGER) 40 $(LLVM_PROF_MERGER)
41@@ -779,7 +781,7 @@ $(IO_OBJS): $(IO_H) 41@@ -792,7 +794,7 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
42 42 @$(MKDIR_P) Include
43 $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) 43 # Avoid copying the file onto itself for an in-tree build
44 @$(MKDIR_P) Include 44 if test "$(cross_compiling)" != "yes"; then \
45- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 45- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
46+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) 46+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
47 $(GRAMMAR_C): $(GRAMMAR_H) 47 else \
48 touch $(GRAMMAR_C) 48 cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \
49 49 mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \
50@@ -968,7 +970,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth 50@@ -990,7 +992,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth
51 ###################################################################### 51 ######################################################################
52 52
53 TESTOPTS= $(EXTRATESTOPTS) 53 TESTOPTS= $(EXTRATESTOPTS)
@@ -56,7 +56,7 @@ Index: Python-3.5.1/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@@ -1455,7 +1457,7 @@ frameworkinstallstructure: $(LDLIBRARY) 59@@ -1481,7 +1483,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.1/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@@ -1521,7 +1523,7 @@ config.status: $(srcdir)/configure 68@@ -1547,7 +1549,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.1/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@@ -1656,7 +1658,7 @@ funny: 77@@ -1683,7 +1685,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
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 44ec424cd2..056e8e7631 100644
--- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
+++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
@@ -7,10 +7,10 @@ get the sys.lib from python itself and do not use hardcoded value of 'lib'
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> 8Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
9 9
10Index: Python-3.5.0/Include/pythonrun.h 10Index: Python-3.5.2/Include/pythonrun.h
11=================================================================== 11===================================================================
12--- Python-3.5.0.orig/Include/pythonrun.h 12--- Python-3.5.2.orig/Include/pythonrun.h
13+++ Python-3.5.0/Include/pythonrun.h 13+++ Python-3.5.2/Include/pythonrun.h
14@@ -23,6 +23,9 @@ typedef struct { 14@@ -23,6 +23,9 @@ typedef struct {
15 } PyCompilerFlags; 15 } PyCompilerFlags;
16 #endif 16 #endif
@@ -21,10 +21,10 @@ Index: Python-3.5.0/Include/pythonrun.h
21 #ifndef Py_LIMITED_API 21 #ifndef Py_LIMITED_API
22 PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); 22 PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
23 PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); 23 PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
24Index: Python-3.5.0/Lib/distutils/command/install.py 24Index: Python-3.5.2/Lib/distutils/command/install.py
25=================================================================== 25===================================================================
26--- Python-3.5.0.orig/Lib/distutils/command/install.py 26--- Python-3.5.2.orig/Lib/distutils/command/install.py
27+++ Python-3.5.0/Lib/distutils/command/install.py 27+++ Python-3.5.2/Lib/distutils/command/install.py
28@@ -19,6 +19,8 @@ from site import USER_BASE 28@@ -19,6 +19,8 @@ from site import USER_BASE
29 from site import USER_SITE 29 from site import USER_SITE
30 HAS_USER_SITE = True 30 HAS_USER_SITE = True
@@ -43,23 +43,23 @@ Index: Python-3.5.0/Lib/distutils/command/install.py
43 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', 43 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
44 'scripts': '$base/bin', 44 'scripts': '$base/bin',
45 'data' : '$base', 45 'data' : '$base',
46Index: Python-3.5.0/Lib/pydoc.py 46Index: Python-3.5.2/Lib/pydoc.py
47=================================================================== 47===================================================================
48--- Python-3.5.0.orig/Lib/pydoc.py 48--- Python-3.5.2.orig/Lib/pydoc.py
49+++ Python-3.5.0/Lib/pydoc.py 49+++ Python-3.5.2/Lib/pydoc.py
50@@ -393,7 +393,7 @@ class Doc: 50@@ -384,7 +384,7 @@ class Doc:
51 docmodule = docclass = docroutine = docother = docproperty = docdata = fail
51 52
52 docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) 53 def getdocloc(self, object,
54- basedir=os.path.join(sys.base_exec_prefix, "lib",
55+ basedir=os.path.join(sys.base_exec_prefix, sys.lib,
56 "python%d.%d" % sys.version_info[:2])):
57 """Return the location of module docs or None"""
53 58
54- basedir = os.path.join(sys.base_exec_prefix, "lib", 59Index: Python-3.5.2/Lib/trace.py
55+ basedir = os.path.join(sys.base_exec_prefix, sys.lib,
56 "python%d.%d" % sys.version_info[:2])
57 if (isinstance(object, type(os)) and
58 (object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
59Index: Python-3.5.0/Lib/trace.py
60=================================================================== 60===================================================================
61--- Python-3.5.0.orig/Lib/trace.py 61--- Python-3.5.2.orig/Lib/trace.py
62+++ Python-3.5.0/Lib/trace.py 62+++ Python-3.5.2/Lib/trace.py
63@@ -749,10 +749,10 @@ def main(argv=None): 63@@ -749,10 +749,10 @@ def main(argv=None):
64 # should I also call expanduser? (after all, could use $HOME) 64 # should I also call expanduser? (after all, could use $HOME)
65 65
@@ -73,11 +73,11 @@ Index: Python-3.5.0/Lib/trace.py
73 "python" + sys.version[:3])) 73 "python" + sys.version[:3]))
74 s = os.path.normpath(s) 74 s = os.path.normpath(s)
75 ignore_dirs.append(s) 75 ignore_dirs.append(s)
76Index: Python-3.5.0/Makefile.pre.in 76Index: Python-3.5.2/Makefile.pre.in
77=================================================================== 77===================================================================
78--- Python-3.5.0.orig/Makefile.pre.in 78--- Python-3.5.2.orig/Makefile.pre.in
79+++ Python-3.5.0/Makefile.pre.in 79+++ Python-3.5.2/Makefile.pre.in
80@@ -101,6 +101,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS 80@@ -106,6 +106,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS
81 81
82 # Machine-dependent subdirectories 82 # Machine-dependent subdirectories
83 MACHDEP= @MACHDEP@ 83 MACHDEP= @MACHDEP@
@@ -86,7 +86,7 @@ Index: Python-3.5.0/Makefile.pre.in
86 86
87 # Multiarch directory (may be empty) 87 # Multiarch directory (may be empty)
88 MULTIARCH= @MULTIARCH@ 88 MULTIARCH= @MULTIARCH@
89@@ -120,7 +122,7 @@ LIBDIR= @libdir@ 89@@ -125,7 +127,7 @@ LIBDIR= @libdir@
90 MANDIR= @mandir@ 90 MANDIR= @mandir@
91 INCLUDEDIR= @includedir@ 91 INCLUDEDIR= @includedir@
92 CONFINCLUDEDIR= $(exec_prefix)/include 92 CONFINCLUDEDIR= $(exec_prefix)/include
@@ -95,7 +95,7 @@ Index: Python-3.5.0/Makefile.pre.in
95 ABIFLAGS= @ABIFLAGS@ 95 ABIFLAGS= @ABIFLAGS@
96 96
97 # Detailed destination directories 97 # Detailed destination directories
98@@ -729,6 +731,7 @@ Modules/getpath.o: $(srcdir)/Modules/get 98@@ -755,6 +757,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
99 -DEXEC_PREFIX='"$(exec_prefix)"' \ 99 -DEXEC_PREFIX='"$(exec_prefix)"' \
100 -DVERSION='"$(VERSION)"' \ 100 -DVERSION='"$(VERSION)"' \
101 -DVPATH='"$(VPATH)"' \ 101 -DVPATH='"$(VPATH)"' \
@@ -103,7 +103,7 @@ Index: Python-3.5.0/Makefile.pre.in
103 -o $@ $(srcdir)/Modules/getpath.c 103 -o $@ $(srcdir)/Modules/getpath.c
104 104
105 Programs/python.o: $(srcdir)/Programs/python.c 105 Programs/python.o: $(srcdir)/Programs/python.c
106@@ -798,7 +801,7 @@ $(OPCODE_H): $(srcdir)/Lib/opcode.py $(O 106@@ -835,7 +838,7 @@ $(OPCODE_H): $(srcdir)/Lib/opcode.py $(O
107 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) 107 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
108 108
109 Python/getplatform.o: $(srcdir)/Python/getplatform.c 109 Python/getplatform.o: $(srcdir)/Python/getplatform.c
@@ -112,25 +112,25 @@ Index: Python-3.5.0/Makefile.pre.in
112 112
113 Python/importdl.o: $(srcdir)/Python/importdl.c 113 Python/importdl.o: $(srcdir)/Python/importdl.c
114 $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c 114 $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
115Index: Python-3.5.0/Modules/getpath.c 115Index: Python-3.5.2/Modules/getpath.c
116=================================================================== 116===================================================================
117--- Python-3.5.0.orig/Modules/getpath.c 117--- Python-3.5.2.orig/Modules/getpath.c
118+++ Python-3.5.0/Modules/getpath.c 118+++ Python-3.5.2/Modules/getpath.c
119@@ -117,9 +117,11 @@ 119@@ -105,6 +105,13 @@
120 #define EXEC_PREFIX PREFIX 120 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
121 #endif 121 #endif
122 122
123+#define LIB_PYTHON LIB "/python" VERSION 123+#define LIB_PYTHON LIB "/python" VERSION
124+ 124+
125 #ifndef PYTHONPATH 125+#ifndef PYTHONPATH
126-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
127- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
128+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ 126+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
129+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" 127+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
130 #endif 128+#endif
131 129+
132 #ifndef LANDMARK 130 #ifndef LANDMARK
133@@ -130,6 +132,7 @@ static wchar_t prefix[MAXPATHLEN+1]; 131 #define LANDMARK L"os.py"
132 #endif
133@@ -113,6 +120,7 @@ static wchar_t prefix[MAXPATHLEN+1];
134 static wchar_t exec_prefix[MAXPATHLEN+1]; 134 static wchar_t exec_prefix[MAXPATHLEN+1];
135 static wchar_t progpath[MAXPATHLEN+1]; 135 static wchar_t progpath[MAXPATHLEN+1];
136 static wchar_t *module_search_path = NULL; 136 static wchar_t *module_search_path = NULL;
@@ -138,10 +138,10 @@ Index: Python-3.5.0/Modules/getpath.c
138 138
139 /* Get file status. Encode the path to the locale encoding. */ 139 /* Get file status. Encode the path to the locale encoding. */
140 140
141Index: Python-3.5.0/Python/getplatform.c 141Index: Python-3.5.2/Python/getplatform.c
142=================================================================== 142===================================================================
143--- Python-3.5.0.orig/Python/getplatform.c 143--- Python-3.5.2.orig/Python/getplatform.c
144+++ Python-3.5.0/Python/getplatform.c 144+++ Python-3.5.2/Python/getplatform.c
145@@ -10,3 +10,23 @@ Py_GetPlatform(void) 145@@ -10,3 +10,23 @@ Py_GetPlatform(void)
146 { 146 {
147 return PLATFORM; 147 return PLATFORM;
@@ -166,11 +166,11 @@ Index: Python-3.5.0/Python/getplatform.c
166+{ 166+{
167+ return LIB; 167+ return LIB;
168+} 168+}
169Index: Python-3.5.0/Python/sysmodule.c 169Index: Python-3.5.2/Python/sysmodule.c
170=================================================================== 170===================================================================
171--- Python-3.5.0.orig/Python/sysmodule.c 171--- Python-3.5.2.orig/Python/sysmodule.c
172+++ Python-3.5.0/Python/sysmodule.c 172+++ Python-3.5.2/Python/sysmodule.c
173@@ -1767,6 +1767,10 @@ _PySys_Init(void) 173@@ -1790,6 +1790,10 @@ _PySys_Init(void)
174 PyUnicode_FromString(Py_GetCopyright())); 174 PyUnicode_FromString(Py_GetCopyright()));
175 SET_SYS_FROM_STRING("platform", 175 SET_SYS_FROM_STRING("platform",
176 PyUnicode_FromString(Py_GetPlatform())); 176 PyUnicode_FromString(Py_GetPlatform()));
@@ -181,11 +181,11 @@ Index: Python-3.5.0/Python/sysmodule.c
181 SET_SYS_FROM_STRING("executable", 181 SET_SYS_FROM_STRING("executable",
182 PyUnicode_FromWideChar( 182 PyUnicode_FromWideChar(
183 Py_GetProgramFullPath(), -1)); 183 Py_GetProgramFullPath(), -1));
184Index: Python-3.5.0/setup.py 184Index: Python-3.5.2/setup.py
185=================================================================== 185===================================================================
186--- Python-3.5.0.orig/setup.py 186--- Python-3.5.2.orig/setup.py
187+++ Python-3.5.0/setup.py 187+++ Python-3.5.2/setup.py
188@@ -472,7 +472,7 @@ class PyBuildExt(build_ext): 188@@ -492,7 +492,7 @@ class PyBuildExt(build_ext):
189 # directories (i.e. '.' and 'Include') must be first. See issue 189 # directories (i.e. '.' and 'Include') must be first. See issue
190 # 10520. 190 # 10520.
191 if not cross_compiling: 191 if not cross_compiling:
@@ -194,7 +194,7 @@ Index: Python-3.5.0/setup.py
194 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 194 add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
195 # only change this for cross builds for 3.3, issues on Mageia 195 # only change this for cross builds for 3.3, issues on Mageia
196 if cross_compiling: 196 if cross_compiling:
197@@ -530,8 +530,7 @@ class PyBuildExt(build_ext): 197@@ -550,8 +550,7 @@ class PyBuildExt(build_ext):
198 # be assumed that no additional -I,-L directives are needed. 198 # be assumed that no additional -I,-L directives are needed.
199 if not cross_compiling: 199 if not cross_compiling:
200 lib_dirs = self.compiler.library_dirs + [ 200 lib_dirs = self.compiler.library_dirs + [
@@ -204,7 +204,7 @@ Index: Python-3.5.0/setup.py
204 ] 204 ]
205 inc_dirs = self.compiler.include_dirs + ['/usr/include'] 205 inc_dirs = self.compiler.include_dirs + ['/usr/include']
206 else: 206 else:
207@@ -716,11 +715,11 @@ class PyBuildExt(build_ext): 207@@ -743,11 +742,11 @@ class PyBuildExt(build_ext):
208 elif curses_library: 208 elif curses_library:
209 readline_libs.append(curses_library) 209 readline_libs.append(curses_library)
210 elif self.compiler.find_library_file(lib_dirs + 210 elif self.compiler.find_library_file(lib_dirs +
@@ -218,10 +218,10 @@ Index: Python-3.5.0/setup.py
218 extra_link_args=readline_extra_link_args, 218 extra_link_args=readline_extra_link_args,
219 libraries=readline_libs) ) 219 libraries=readline_libs) )
220 else: 220 else:
221Index: Python-3.5.0/Lib/sysconfig.py 221Index: Python-3.5.2/Lib/sysconfig.py
222=================================================================== 222===================================================================
223--- Python-3.5.0.orig/Lib/sysconfig.py 223--- Python-3.5.2.orig/Lib/sysconfig.py
224+++ Python-3.5.0/Lib/sysconfig.py 224+++ Python-3.5.2/Lib/sysconfig.py
225@@ -20,10 +20,10 @@ __all__ = [ 225@@ -20,10 +20,10 @@ __all__ = [
226 226
227 _INSTALL_SCHEMES = { 227 _INSTALL_SCHEMES = {
@@ -264,11 +264,11 @@ Index: Python-3.5.0/Lib/sysconfig.py
264 'include': '{userbase}/include/python{py_version_short}', 264 'include': '{userbase}/include/python{py_version_short}',
265 'scripts': '{userbase}/bin', 265 'scripts': '{userbase}/bin',
266 'data': '{userbase}', 266 'data': '{userbase}',
267Index: Python-3.5.0/configure.ac 267Index: Python-3.5.2/configure.ac
268=================================================================== 268===================================================================
269--- Python-3.5.0.orig/configure.ac 269--- Python-3.5.2.orig/configure.ac
270+++ Python-3.5.0/configure.ac 270+++ Python-3.5.2/configure.ac
271@@ -858,6 +858,41 @@ PLATDIR=plat-$MACHDEP 271@@ -876,6 +876,41 @@ PLATDIR=plat-$MACHDEP
272 AC_SUBST(PLATDIR) 272 AC_SUBST(PLATDIR)
273 AC_SUBST(PLATFORM_TRIPLET) 273 AC_SUBST(PLATFORM_TRIPLET)
274 274