diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/multilib.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/multilib.patch | 98 |
1 files changed, 49 insertions, 49 deletions
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 @@ | |||
1 | Rebased for python-2.7.9 | 1 | Rebased for python-2.7.9 |
2 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> |
3 | Upstream-Status: Pending | 3 | Upstream-Status: Pending |
4 | Index: Python-2.7.13/configure.ac | 4 | Index: 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) |
19 | Index: Python-2.7.13/Include/pythonrun.h | 19 | Index: 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); |
31 | Index: Python-2.7.13/Lib/distutils/command/install.py | 31 | Index: 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', |
55 | Index: Python-2.7.13/Lib/distutils/sysconfig.py | 55 | Index: 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: |
73 | Index: Python-2.7.13/Lib/pydoc.py | 73 | Index: 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 | ||
86 | Index: Python-2.7.13/Lib/site.py | 86 | Index: 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): |
112 | Index: Python-2.7.13/Lib/sysconfig.py | 112 | Index: 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}', |
144 | Index: Python-2.7.13/Lib/test/test_dl.py | 144 | Index: 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 | ] |
162 | Index: Python-2.7.13/Lib/test/test_site.py | 162 | Index: 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) |
186 | Index: Python-2.7.13/Lib/trace.py | 186 | Index: 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) |
203 | Index: Python-2.7.13/Makefile.pre.in | 203 | Index: 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 |
241 | Index: Python-2.7.13/Modules/getpath.c | 241 | Index: 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) |
268 | Index: Python-2.7.13/Python/getplatform.c | 268 | Index: 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 | +} |
286 | Index: Python-2.7.13/Python/sysmodule.c | 286 | Index: 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", |