diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/multilib.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/multilib.patch | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch index b169133d7d..50cc5911aa 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 | 3 | ||
4 | Index: Python-2.7.12/configure.ac | 4 | Index: Python-2.7.13/configure.ac |
5 | =================================================================== | 5 | =================================================================== |
6 | --- Python-2.7.12.orig/configure.ac | 6 | --- Python-2.7.13.orig/configure.ac |
7 | +++ Python-2.7.12/configure.ac | 7 | +++ Python-2.7.13/configure.ac |
8 | @@ -756,6 +756,10 @@ SunOS*) | 8 | @@ -759,6 +759,10 @@ SunOS*) |
9 | ;; | 9 | ;; |
10 | esac | 10 | esac |
11 | 11 | ||
@@ -16,10 +16,10 @@ Index: Python-2.7.12/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.12/Include/pythonrun.h | 19 | Index: Python-2.7.13/Include/pythonrun.h |
20 | =================================================================== | 20 | =================================================================== |
21 | --- Python-2.7.12.orig/Include/pythonrun.h | 21 | --- Python-2.7.13.orig/Include/pythonrun.h |
22 | +++ Python-2.7.12/Include/pythonrun.h | 22 | +++ Python-2.7.13/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.12/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.12/Lib/distutils/command/install.py | 31 | Index: Python-2.7.13/Lib/distutils/command/install.py |
32 | =================================================================== | 32 | =================================================================== |
33 | --- Python-2.7.12.orig/Lib/distutils/command/install.py | 33 | --- Python-2.7.13.orig/Lib/distutils/command/install.py |
34 | +++ Python-2.7.12/Lib/distutils/command/install.py | 34 | +++ Python-2.7.13/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 | ||
@@ -50,10 +50,10 @@ Index: Python-2.7.12/Lib/distutils/command/install.py | |||
50 | 'headers': '$base/include/python$py_version_short/$dist_name', | 50 | 'headers': '$base/include/python$py_version_short/$dist_name', |
51 | 'scripts': '$base/bin', | 51 | 'scripts': '$base/bin', |
52 | 'data' : '$base', | 52 | 'data' : '$base', |
53 | Index: Python-2.7.12/Lib/distutils/sysconfig.py | 53 | Index: Python-2.7.13/Lib/distutils/sysconfig.py |
54 | =================================================================== | 54 | =================================================================== |
55 | --- Python-2.7.12.orig/Lib/distutils/sysconfig.py | 55 | --- Python-2.7.13.orig/Lib/distutils/sysconfig.py |
56 | +++ Python-2.7.12/Lib/distutils/sysconfig.py | 56 | +++ Python-2.7.13/Lib/distutils/sysconfig.py |
57 | @@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan | 57 | @@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan |
58 | prefix = plat_specific and EXEC_PREFIX or PREFIX | 58 | prefix = plat_specific and EXEC_PREFIX or PREFIX |
59 | 59 | ||
@@ -68,23 +68,23 @@ Index: Python-2.7.12/Lib/distutils/sysconfig.py | |||
68 | if standard_lib: | 68 | if standard_lib: |
69 | return libpython | 69 | return libpython |
70 | else: | 70 | else: |
71 | Index: Python-2.7.12/Lib/pydoc.py | 71 | Index: Python-2.7.13/Lib/pydoc.py |
72 | =================================================================== | 72 | =================================================================== |
73 | --- Python-2.7.12.orig/Lib/pydoc.py | 73 | --- Python-2.7.13.orig/Lib/pydoc.py |
74 | +++ Python-2.7.12/Lib/pydoc.py | 74 | +++ Python-2.7.13/Lib/pydoc.py |
75 | @@ -384,7 +384,7 @@ class Doc: | 75 | @@ -375,7 +375,7 @@ class Doc: |
76 | docmodule = docclass = docroutine = docother = docproperty = docdata = fail | ||
76 | 77 | ||
77 | docloc = os.environ.get("PYTHONDOCS", | 78 | def getdocloc(self, object, |
78 | "http://docs.python.org/library") | 79 | - basedir=os.path.join(sys.exec_prefix, "lib", |
79 | - basedir = os.path.join(sys.exec_prefix, "lib", | 80 | + basedir=os.path.join(sys.exec_prefix, "sys.lib", |
80 | + basedir = os.path.join(sys.exec_prefix, sys.lib, | 81 | "python"+sys.version[0:3])): |
81 | "python"+sys.version[0:3]) | 82 | """Return the location of module docs or None""" |
82 | if (isinstance(object, type(os)) and | 83 | |
83 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', | 84 | Index: Python-2.7.13/Lib/site.py |
84 | Index: Python-2.7.12/Lib/site.py | ||
85 | =================================================================== | 85 | =================================================================== |
86 | --- Python-2.7.12.orig/Lib/site.py | 86 | --- Python-2.7.13.orig/Lib/site.py |
87 | +++ Python-2.7.12/Lib/site.py | 87 | +++ Python-2.7.13/Lib/site.py |
88 | @@ -288,13 +288,18 @@ def getsitepackages(): | 88 | @@ -288,13 +288,18 @@ def getsitepackages(): |
89 | if sys.platform in ('os2emx', 'riscos'): | 89 | if sys.platform in ('os2emx', 'riscos'): |
90 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) | 90 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) |
@@ -104,13 +104,13 @@ Index: Python-2.7.12/Lib/site.py | |||
104 | sitepackages.append(prefix) | 104 | sitepackages.append(prefix) |
105 | - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) | 105 | - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) |
106 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) | 106 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) |
107 | if sys.platform == "darwin": | 107 | return sitepackages |
108 | # for framework builds *only* we add the standard Apple | 108 | |
109 | # locations. | 109 | def addsitepackages(known_paths): |
110 | Index: Python-2.7.12/Lib/sysconfig.py | 110 | Index: Python-2.7.13/Lib/sysconfig.py |
111 | =================================================================== | 111 | =================================================================== |
112 | --- Python-2.7.12.orig/Lib/sysconfig.py | 112 | --- Python-2.7.13.orig/Lib/sysconfig.py |
113 | +++ Python-2.7.12/Lib/sysconfig.py | 113 | +++ Python-2.7.13/Lib/sysconfig.py |
114 | @@ -7,10 +7,10 @@ from os.path import pardir, realpath | 114 | @@ -7,10 +7,10 @@ from os.path import pardir, realpath |
115 | 115 | ||
116 | _INSTALL_SCHEMES = { | 116 | _INSTALL_SCHEMES = { |
@@ -139,10 +139,10 @@ Index: Python-2.7.12/Lib/sysconfig.py | |||
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 | Index: Python-2.7.12/Lib/test/test_dl.py | 142 | Index: Python-2.7.13/Lib/test/test_dl.py |
143 | =================================================================== | 143 | =================================================================== |
144 | --- Python-2.7.12.orig/Lib/test/test_dl.py | 144 | --- Python-2.7.13.orig/Lib/test/test_dl.py |
145 | +++ Python-2.7.12/Lib/test/test_dl.py | 145 | +++ Python-2.7.13/Lib/test/test_dl.py |
146 | @@ -4,10 +4,11 @@ | 146 | @@ -4,10 +4,11 @@ |
147 | import unittest | 147 | import unittest |
148 | from test.test_support import verbose, import_module | 148 | from test.test_support import verbose, import_module |
@@ -157,14 +157,14 @@ Index: Python-2.7.12/Lib/test/test_dl.py | |||
157 | ('/usr/bin/cygwin1.dll', 'getpid'), | 157 | ('/usr/bin/cygwin1.dll', 'getpid'), |
158 | ('/usr/lib/libc.dylib', 'getpid'), | 158 | ('/usr/lib/libc.dylib', 'getpid'), |
159 | ] | 159 | ] |
160 | Index: Python-2.7.12/Lib/test/test_site.py | 160 | Index: Python-2.7.13/Lib/test/test_site.py |
161 | =================================================================== | 161 | =================================================================== |
162 | --- Python-2.7.12.orig/Lib/test/test_site.py | 162 | --- Python-2.7.13.orig/Lib/test/test_site.py |
163 | +++ Python-2.7.12/Lib/test/test_site.py | 163 | +++ Python-2.7.13/Lib/test/test_site.py |
164 | @@ -246,12 +246,16 @@ class HelperFunctionsTests(unittest.Test | 164 | @@ -235,12 +235,16 @@ class HelperFunctionsTests(unittest.Test |
165 | self.assertEqual(dirs[2], wanted) | 165 | self.assertEqual(dirs[0], wanted) |
166 | elif os.sep == '/': | 166 | elif os.sep == '/': |
167 | # OS X non-framwework builds, Linux, FreeBSD, etc | 167 | # OS X, Linux, FreeBSD, etc |
168 | - self.assertEqual(len(dirs), 2) | 168 | - self.assertEqual(len(dirs), 2) |
169 | wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], | 169 | wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], |
170 | 'site-packages') | 170 | 'site-packages') |
@@ -181,10 +181,10 @@ Index: Python-2.7.12/Lib/test/test_site.py | |||
181 | else: | 181 | else: |
182 | # other platforms | 182 | # other platforms |
183 | self.assertEqual(len(dirs), 2) | 183 | self.assertEqual(len(dirs), 2) |
184 | Index: Python-2.7.12/Lib/trace.py | 184 | Index: Python-2.7.13/Lib/trace.py |
185 | =================================================================== | 185 | =================================================================== |
186 | --- Python-2.7.12.orig/Lib/trace.py | 186 | --- Python-2.7.13.orig/Lib/trace.py |
187 | +++ Python-2.7.12/Lib/trace.py | 187 | +++ Python-2.7.13/Lib/trace.py |
188 | @@ -754,10 +754,10 @@ def main(argv=None): | 188 | @@ -754,10 +754,10 @@ def main(argv=None): |
189 | # should I also call expanduser? (after all, could use $HOME) | 189 | # should I also call expanduser? (after all, could use $HOME) |
190 | 190 | ||
@@ -198,10 +198,10 @@ Index: Python-2.7.12/Lib/trace.py | |||
198 | "python" + sys.version[:3])) | 198 | "python" + sys.version[:3])) |
199 | s = os.path.normpath(s) | 199 | s = os.path.normpath(s) |
200 | ignore_dirs.append(s) | 200 | ignore_dirs.append(s) |
201 | Index: Python-2.7.12/Makefile.pre.in | 201 | Index: Python-2.7.13/Makefile.pre.in |
202 | =================================================================== | 202 | =================================================================== |
203 | --- Python-2.7.12.orig/Makefile.pre.in | 203 | --- Python-2.7.13.orig/Makefile.pre.in |
204 | +++ Python-2.7.12/Makefile.pre.in | 204 | +++ Python-2.7.13/Makefile.pre.in |
205 | @@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG | 205 | @@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG |
206 | 206 | ||
207 | # Machine-dependent subdirectories | 207 | # Machine-dependent subdirectories |
@@ -219,7 +219,7 @@ Index: Python-2.7.12/Makefile.pre.in | |||
219 | 219 | ||
220 | # Detailed destination directories | 220 | # Detailed destination directories |
221 | BINLIBDEST= $(LIBDIR)/python$(VERSION) | 221 | BINLIBDEST= $(LIBDIR)/python$(VERSION) |
222 | @@ -670,6 +671,7 @@ Modules/getpath.o: $(srcdir)/Modules/get | 222 | @@ -669,6 +670,7 @@ Modules/getpath.o: $(srcdir)/Modules/get |
223 | -DEXEC_PREFIX='"$(exec_prefix)"' \ | 223 | -DEXEC_PREFIX='"$(exec_prefix)"' \ |
224 | -DVERSION='"$(VERSION)"' \ | 224 | -DVERSION='"$(VERSION)"' \ |
225 | -DVPATH='"$(VPATH)"' \ | 225 | -DVPATH='"$(VPATH)"' \ |
@@ -227,7 +227,7 @@ Index: Python-2.7.12/Makefile.pre.in | |||
227 | -o $@ $(srcdir)/Modules/getpath.c | 227 | -o $@ $(srcdir)/Modules/getpath.c |
228 | 228 | ||
229 | Modules/python.o: $(srcdir)/Modules/python.c | 229 | Modules/python.o: $(srcdir)/Modules/python.c |
230 | @@ -721,7 +723,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) | 230 | @@ -709,7 +711,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) |
231 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) | 231 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) |
232 | 232 | ||
233 | Python/getplatform.o: $(srcdir)/Python/getplatform.c | 233 | Python/getplatform.o: $(srcdir)/Python/getplatform.c |
@@ -236,10 +236,10 @@ Index: Python-2.7.12/Makefile.pre.in | |||
236 | 236 | ||
237 | Python/importdl.o: $(srcdir)/Python/importdl.c | 237 | Python/importdl.o: $(srcdir)/Python/importdl.c |
238 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c | 238 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c |
239 | Index: Python-2.7.12/Modules/getpath.c | 239 | Index: Python-2.7.13/Modules/getpath.c |
240 | =================================================================== | 240 | =================================================================== |
241 | --- Python-2.7.12.orig/Modules/getpath.c | 241 | --- Python-2.7.13.orig/Modules/getpath.c |
242 | +++ Python-2.7.12/Modules/getpath.c | 242 | +++ Python-2.7.13/Modules/getpath.c |
243 | @@ -100,6 +100,13 @@ | 243 | @@ -100,6 +100,13 @@ |
244 | #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" | 244 | #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" |
245 | #endif | 245 | #endif |
@@ -263,10 +263,10 @@ Index: Python-2.7.12/Modules/getpath.c | |||
263 | 263 | ||
264 | static void | 264 | static void |
265 | reduce(char *dir) | 265 | reduce(char *dir) |
266 | Index: Python-2.7.12/Python/getplatform.c | 266 | Index: Python-2.7.13/Python/getplatform.c |
267 | =================================================================== | 267 | =================================================================== |
268 | --- Python-2.7.12.orig/Python/getplatform.c | 268 | --- Python-2.7.13.orig/Python/getplatform.c |
269 | +++ Python-2.7.12/Python/getplatform.c | 269 | +++ Python-2.7.13/Python/getplatform.c |
270 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) | 270 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) |
271 | { | 271 | { |
272 | return PLATFORM; | 272 | return PLATFORM; |
@@ -281,10 +281,10 @@ Index: Python-2.7.12/Python/getplatform.c | |||
281 | +{ | 281 | +{ |
282 | + return LIB; | 282 | + return LIB; |
283 | +} | 283 | +} |
284 | Index: Python-2.7.12/Python/sysmodule.c | 284 | Index: Python-2.7.13/Python/sysmodule.c |
285 | =================================================================== | 285 | =================================================================== |
286 | --- Python-2.7.12.orig/Python/sysmodule.c | 286 | --- Python-2.7.13.orig/Python/sysmodule.c |
287 | +++ Python-2.7.12/Python/sysmodule.c | 287 | +++ Python-2.7.13/Python/sysmodule.c |
288 | @@ -1437,6 +1437,8 @@ _PySys_Init(void) | 288 | @@ -1437,6 +1437,8 @@ _PySys_Init(void) |
289 | PyString_FromString(Py_GetCopyright())); | 289 | PyString_FromString(Py_GetCopyright())); |
290 | SET_SYS_FROM_STRING("platform", | 290 | SET_SYS_FROM_STRING("platform", |