diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3')
-rw-r--r-- | meta/recipes-devtools/python/python3/python-3.3-multilib.patch | 121 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 12 |
2 files changed, 65 insertions, 68 deletions
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 | ||
28 | diff --git a/Include/pythonrun.h b/Include/pythonrun.h | 28 | Index: Python-3.5.4/Include/pythonrun.h |
29 | index 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 *); |
42 | diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py | 42 | Index: Python-3.5.4/Lib/distutils/command/install.py |
43 | index 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', |
64 | diff --git a/Lib/pydoc.py b/Lib/pydoc.py | 64 | Index: Python-3.5.4/Lib/pydoc.py |
65 | index 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 | ||
77 | diff --git a/Lib/site.py b/Lib/site.py | 77 | Index: Python-3.5.4/Lib/site.py |
78 | index 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. |
96 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py | 96 | Index: Python-3.5.4/Lib/sysconfig.py |
97 | index 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}', |
142 | diff --git a/Lib/trace.py b/Lib/trace.py | 142 | Index: Python-3.5.4/Lib/trace.py |
143 | index 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) |
159 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 159 | Index: Python-3.5.4/Makefile.pre.in |
160 | index 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 |
198 | diff --git a/Modules/getpath.c b/Modules/getpath.c | 198 | Index: Python-3.5.4/Modules/getpath.c |
199 | index 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( |
233 | diff --git a/Python/getplatform.c b/Python/getplatform.c | 233 | Index: Python-3.5.4/Python/getplatform.c |
234 | index 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 | +} |
261 | diff --git a/Python/sysmodule.c b/Python/sysmodule.c | 261 | Index: Python-3.5.4/Python/sysmodule.c |
262 | index 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)); |
276 | diff --git a/configure.ac b/configure.ac | 276 | Index: Python-3.5.4/configure.ac |
277 | index 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" |
322 | diff --git a/setup.py b/setup.py | 322 | Index: Python-3.5.4/setup.py |
323 | index 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 | -- | ||
360 | 2.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 | ||
13 | Index: Python-3.5.3/configure.ac | 13 | Index: 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]) |