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, 60 insertions, 58 deletions
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch index 0bfa0d2cf4..5360226980 100644 --- a/meta/recipes-devtools/python/python/multilib.patch +++ b/meta/recipes-devtools/python/python/multilib.patch | |||
@@ -1,11 +1,13 @@ | |||
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.9/configure.ac | 4 | Rebased for python-2.7.12 |
5 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
6 | Index: Python-2.7.12/configure.ac | ||
5 | =================================================================== | 7 | =================================================================== |
6 | --- Python-2.7.9.orig/configure.ac | 8 | --- Python-2.7.12.orig/configure.ac |
7 | +++ Python-2.7.9/configure.ac | 9 | +++ Python-2.7.12/configure.ac |
8 | @@ -736,6 +736,10 @@ SunOS*) | 10 | @@ -756,6 +756,10 @@ SunOS*) |
9 | ;; | 11 | ;; |
10 | esac | 12 | esac |
11 | 13 | ||
@@ -16,10 +18,10 @@ Index: Python-2.7.9/configure.ac | |||
16 | 18 | ||
17 | AC_SUBST(LIBRARY) | 19 | AC_SUBST(LIBRARY) |
18 | AC_MSG_CHECKING(LIBRARY) | 20 | AC_MSG_CHECKING(LIBRARY) |
19 | Index: Python-2.7.9/Include/pythonrun.h | 21 | Index: Python-2.7.12/Include/pythonrun.h |
20 | =================================================================== | 22 | =================================================================== |
21 | --- Python-2.7.9.orig/Include/pythonrun.h | 23 | --- Python-2.7.12.orig/Include/pythonrun.h |
22 | +++ Python-2.7.9/Include/pythonrun.h | 24 | +++ Python-2.7.12/Include/pythonrun.h |
23 | @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); | 25 | @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); |
24 | /* In their own files */ | 26 | /* In their own files */ |
25 | PyAPI_FUNC(const char *) Py_GetVersion(void); | 27 | PyAPI_FUNC(const char *) Py_GetVersion(void); |
@@ -28,10 +30,10 @@ Index: Python-2.7.9/Include/pythonrun.h | |||
28 | PyAPI_FUNC(const char *) Py_GetCopyright(void); | 30 | PyAPI_FUNC(const char *) Py_GetCopyright(void); |
29 | PyAPI_FUNC(const char *) Py_GetCompiler(void); | 31 | PyAPI_FUNC(const char *) Py_GetCompiler(void); |
30 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); | 32 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); |
31 | Index: Python-2.7.9/Lib/distutils/command/install.py | 33 | Index: Python-2.7.12/Lib/distutils/command/install.py |
32 | =================================================================== | 34 | =================================================================== |
33 | --- Python-2.7.9.orig/Lib/distutils/command/install.py | 35 | --- Python-2.7.12.orig/Lib/distutils/command/install.py |
34 | +++ Python-2.7.9/Lib/distutils/command/install.py | 36 | +++ Python-2.7.12/Lib/distutils/command/install.py |
35 | @@ -22,6 +22,8 @@ from site import USER_BASE | 37 | @@ -22,6 +22,8 @@ from site import USER_BASE |
36 | from site import USER_SITE | 38 | from site import USER_SITE |
37 | 39 | ||
@@ -50,10 +52,10 @@ Index: Python-2.7.9/Lib/distutils/command/install.py | |||
50 | 'headers': '$base/include/python$py_version_short/$dist_name', | 52 | 'headers': '$base/include/python$py_version_short/$dist_name', |
51 | 'scripts': '$base/bin', | 53 | 'scripts': '$base/bin', |
52 | 'data' : '$base', | 54 | 'data' : '$base', |
53 | Index: Python-2.7.9/Lib/distutils/sysconfig.py | 55 | Index: Python-2.7.12/Lib/distutils/sysconfig.py |
54 | =================================================================== | 56 | =================================================================== |
55 | --- Python-2.7.9.orig/Lib/distutils/sysconfig.py | 57 | --- Python-2.7.12.orig/Lib/distutils/sysconfig.py |
56 | +++ Python-2.7.9/Lib/distutils/sysconfig.py | 58 | +++ Python-2.7.12/Lib/distutils/sysconfig.py |
57 | @@ -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 |
58 | prefix = plat_specific and EXEC_PREFIX or PREFIX | 60 | prefix = plat_specific and EXEC_PREFIX or PREFIX |
59 | 61 | ||
@@ -68,11 +70,11 @@ Index: Python-2.7.9/Lib/distutils/sysconfig.py | |||
68 | if standard_lib: | 70 | if standard_lib: |
69 | return libpython | 71 | return libpython |
70 | else: | 72 | else: |
71 | Index: Python-2.7.9/Lib/pydoc.py | 73 | Index: Python-2.7.12/Lib/pydoc.py |
72 | =================================================================== | 74 | =================================================================== |
73 | --- Python-2.7.9.orig/Lib/pydoc.py | 75 | --- Python-2.7.12.orig/Lib/pydoc.py |
74 | +++ Python-2.7.9/Lib/pydoc.py | 76 | +++ Python-2.7.12/Lib/pydoc.py |
75 | @@ -383,7 +383,7 @@ class Doc: | 77 | @@ -384,7 +384,7 @@ class Doc: |
76 | 78 | ||
77 | docloc = os.environ.get("PYTHONDOCS", | 79 | docloc = os.environ.get("PYTHONDOCS", |
78 | "http://docs.python.org/library") | 80 | "http://docs.python.org/library") |
@@ -81,10 +83,10 @@ Index: Python-2.7.9/Lib/pydoc.py | |||
81 | "python"+sys.version[0:3]) | 83 | "python"+sys.version[0:3]) |
82 | if (isinstance(object, type(os)) and | 84 | if (isinstance(object, type(os)) and |
83 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', | 85 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', |
84 | Index: Python-2.7.9/Lib/site.py | 86 | Index: Python-2.7.12/Lib/site.py |
85 | =================================================================== | 87 | =================================================================== |
86 | --- Python-2.7.9.orig/Lib/site.py | 88 | --- Python-2.7.12.orig/Lib/site.py |
87 | +++ Python-2.7.9/Lib/site.py | 89 | +++ Python-2.7.12/Lib/site.py |
88 | @@ -288,13 +288,18 @@ def getsitepackages(): | 90 | @@ -288,13 +288,18 @@ def getsitepackages(): |
89 | if sys.platform in ('os2emx', 'riscos'): | 91 | if sys.platform in ('os2emx', 'riscos'): |
90 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) | 92 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) |
@@ -107,10 +109,10 @@ Index: Python-2.7.9/Lib/site.py | |||
107 | if sys.platform == "darwin": | 109 | if sys.platform == "darwin": |
108 | # for framework builds *only* we add the standard Apple | 110 | # for framework builds *only* we add the standard Apple |
109 | # locations. | 111 | # locations. |
110 | Index: Python-2.7.9/Lib/sysconfig.py | 112 | Index: Python-2.7.12/Lib/sysconfig.py |
111 | =================================================================== | 113 | =================================================================== |
112 | --- Python-2.7.9.orig/Lib/sysconfig.py | 114 | --- Python-2.7.12.orig/Lib/sysconfig.py |
113 | +++ Python-2.7.9/Lib/sysconfig.py | 115 | +++ Python-2.7.12/Lib/sysconfig.py |
114 | @@ -7,10 +7,10 @@ from os.path import pardir, realpath | 116 | @@ -7,10 +7,10 @@ from os.path import pardir, realpath |
115 | 117 | ||
116 | _INSTALL_SCHEMES = { | 118 | _INSTALL_SCHEMES = { |
@@ -139,10 +141,10 @@ Index: Python-2.7.9/Lib/sysconfig.py | |||
139 | 'include': '{userbase}/include/python{py_version_short}', | 141 | 'include': '{userbase}/include/python{py_version_short}', |
140 | 'scripts': '{userbase}/bin', | 142 | 'scripts': '{userbase}/bin', |
141 | 'data' : '{userbase}', | 143 | 'data' : '{userbase}', |
142 | Index: Python-2.7.9/Lib/test/test_dl.py | 144 | Index: Python-2.7.12/Lib/test/test_dl.py |
143 | =================================================================== | 145 | =================================================================== |
144 | --- Python-2.7.9.orig/Lib/test/test_dl.py | 146 | --- Python-2.7.12.orig/Lib/test/test_dl.py |
145 | +++ Python-2.7.9/Lib/test/test_dl.py | 147 | +++ Python-2.7.12/Lib/test/test_dl.py |
146 | @@ -4,10 +4,11 @@ | 148 | @@ -4,10 +4,11 @@ |
147 | import unittest | 149 | import unittest |
148 | from test.test_support import verbose, import_module | 150 | from test.test_support import verbose, import_module |
@@ -157,11 +159,11 @@ Index: Python-2.7.9/Lib/test/test_dl.py | |||
157 | ('/usr/bin/cygwin1.dll', 'getpid'), | 159 | ('/usr/bin/cygwin1.dll', 'getpid'), |
158 | ('/usr/lib/libc.dylib', 'getpid'), | 160 | ('/usr/lib/libc.dylib', 'getpid'), |
159 | ] | 161 | ] |
160 | Index: Python-2.7.9/Lib/test/test_site.py | 162 | Index: Python-2.7.12/Lib/test/test_site.py |
161 | =================================================================== | 163 | =================================================================== |
162 | --- Python-2.7.9.orig/Lib/test/test_site.py | 164 | --- Python-2.7.12.orig/Lib/test/test_site.py |
163 | +++ Python-2.7.9/Lib/test/test_site.py | 165 | +++ Python-2.7.12/Lib/test/test_site.py |
164 | @@ -241,12 +241,16 @@ class HelperFunctionsTests(unittest.Test | 166 | @@ -246,12 +246,16 @@ class HelperFunctionsTests(unittest.Test |
165 | self.assertEqual(dirs[2], wanted) | 167 | self.assertEqual(dirs[2], wanted) |
166 | elif os.sep == '/': | 168 | elif os.sep == '/': |
167 | # OS X non-framwework builds, Linux, FreeBSD, etc | 169 | # OS X non-framwework builds, Linux, FreeBSD, etc |
@@ -181,10 +183,10 @@ Index: Python-2.7.9/Lib/test/test_site.py | |||
181 | else: | 183 | else: |
182 | # other platforms | 184 | # other platforms |
183 | self.assertEqual(len(dirs), 2) | 185 | self.assertEqual(len(dirs), 2) |
184 | Index: Python-2.7.9/Lib/trace.py | 186 | Index: Python-2.7.12/Lib/trace.py |
185 | =================================================================== | 187 | =================================================================== |
186 | --- Python-2.7.9.orig/Lib/trace.py | 188 | --- Python-2.7.12.orig/Lib/trace.py |
187 | +++ Python-2.7.9/Lib/trace.py | 189 | +++ Python-2.7.12/Lib/trace.py |
188 | @@ -754,10 +754,10 @@ def main(argv=None): | 190 | @@ -754,10 +754,10 @@ def main(argv=None): |
189 | # should I also call expanduser? (after all, could use $HOME) | 191 | # should I also call expanduser? (after all, could use $HOME) |
190 | 192 | ||
@@ -198,11 +200,11 @@ Index: Python-2.7.9/Lib/trace.py | |||
198 | "python" + sys.version[:3])) | 200 | "python" + sys.version[:3])) |
199 | s = os.path.normpath(s) | 201 | s = os.path.normpath(s) |
200 | ignore_dirs.append(s) | 202 | ignore_dirs.append(s) |
201 | Index: Python-2.7.9/Makefile.pre.in | 203 | Index: Python-2.7.12/Makefile.pre.in |
202 | =================================================================== | 204 | =================================================================== |
203 | --- Python-2.7.9.orig/Makefile.pre.in | 205 | --- Python-2.7.12.orig/Makefile.pre.in |
204 | +++ Python-2.7.9/Makefile.pre.in | 206 | +++ Python-2.7.12/Makefile.pre.in |
205 | @@ -87,6 +87,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG | 207 | @@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG |
206 | 208 | ||
207 | # Machine-dependent subdirectories | 209 | # Machine-dependent subdirectories |
208 | MACHDEP= @MACHDEP@ | 210 | MACHDEP= @MACHDEP@ |
@@ -210,7 +212,7 @@ Index: Python-2.7.9/Makefile.pre.in | |||
210 | 212 | ||
211 | # Multiarch directory (may be empty) | 213 | # Multiarch directory (may be empty) |
212 | MULTIARCH= @MULTIARCH@ | 214 | MULTIARCH= @MULTIARCH@ |
213 | @@ -106,7 +107,7 @@ LIBDIR= @libdir@ | 215 | @@ -111,7 +112,7 @@ LIBDIR= @libdir@ |
214 | MANDIR= @mandir@ | 216 | MANDIR= @mandir@ |
215 | INCLUDEDIR= @includedir@ | 217 | INCLUDEDIR= @includedir@ |
216 | CONFINCLUDEDIR= $(exec_prefix)/include | 218 | CONFINCLUDEDIR= $(exec_prefix)/include |
@@ -219,7 +221,7 @@ Index: Python-2.7.9/Makefile.pre.in | |||
219 | 221 | ||
220 | # Detailed destination directories | 222 | # Detailed destination directories |
221 | BINLIBDEST= $(LIBDIR)/python$(VERSION) | 223 | BINLIBDEST= $(LIBDIR)/python$(VERSION) |
222 | @@ -598,6 +599,7 @@ Modules/getpath.o: $(srcdir)/Modules/get | 224 | @@ -670,6 +671,7 @@ Modules/getpath.o: $(srcdir)/Modules/get |
223 | -DEXEC_PREFIX='"$(exec_prefix)"' \ | 225 | -DEXEC_PREFIX='"$(exec_prefix)"' \ |
224 | -DVERSION='"$(VERSION)"' \ | 226 | -DVERSION='"$(VERSION)"' \ |
225 | -DVPATH='"$(VPATH)"' \ | 227 | -DVPATH='"$(VPATH)"' \ |
@@ -227,7 +229,7 @@ Index: Python-2.7.9/Makefile.pre.in | |||
227 | -o $@ $(srcdir)/Modules/getpath.c | 229 | -o $@ $(srcdir)/Modules/getpath.c |
228 | 230 | ||
229 | Modules/python.o: $(srcdir)/Modules/python.c | 231 | Modules/python.o: $(srcdir)/Modules/python.c |
230 | @@ -640,7 +642,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) | 232 | @@ -721,7 +723,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) |
231 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) | 233 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) |
232 | 234 | ||
233 | Python/getplatform.o: $(srcdir)/Python/getplatform.c | 235 | Python/getplatform.o: $(srcdir)/Python/getplatform.c |
@@ -236,25 +238,25 @@ Index: Python-2.7.9/Makefile.pre.in | |||
236 | 238 | ||
237 | Python/importdl.o: $(srcdir)/Python/importdl.c | 239 | Python/importdl.o: $(srcdir)/Python/importdl.c |
238 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c | 240 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c |
239 | Index: Python-2.7.9/Modules/getpath.c | 241 | Index: Python-2.7.12/Modules/getpath.c |
240 | =================================================================== | 242 | =================================================================== |
241 | --- Python-2.7.9.orig/Modules/getpath.c | 243 | --- Python-2.7.12.orig/Modules/getpath.c |
242 | +++ Python-2.7.9/Modules/getpath.c | 244 | +++ Python-2.7.12/Modules/getpath.c |
243 | @@ -116,9 +116,11 @@ | 245 | @@ -100,6 +100,13 @@ |
244 | #define EXEC_PREFIX PREFIX | 246 | #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" |
245 | #endif | 247 | #endif |
246 | 248 | ||
247 | +#define LIB_PYTHON LIB "/python" VERSION | 249 | +#define LIB_PYTHON LIB "/python" VERSION |
248 | + | 250 | + |
249 | #ifndef PYTHONPATH | 251 | +#ifndef PYTHONPATH |
250 | -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ | ||
251 | - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" | ||
252 | +#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ | 252 | +#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ |
253 | + EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" | 253 | + EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" |
254 | #endif | 254 | +#endif |
255 | 255 | + | |
256 | #ifndef LANDMARK | 256 | #ifndef LANDMARK |
257 | @@ -129,7 +131,7 @@ static char prefix[MAXPATHLEN+1]; | 257 | #define LANDMARK "os.py" |
258 | #endif | ||
259 | @@ -108,7 +115,7 @@ static char prefix[MAXPATHLEN+1]; | ||
258 | static char exec_prefix[MAXPATHLEN+1]; | 260 | static char exec_prefix[MAXPATHLEN+1]; |
259 | static char progpath[MAXPATHLEN+1]; | 261 | static char progpath[MAXPATHLEN+1]; |
260 | static char *module_search_path = NULL; | 262 | static char *module_search_path = NULL; |
@@ -263,10 +265,10 @@ Index: Python-2.7.9/Modules/getpath.c | |||
263 | 265 | ||
264 | static void | 266 | static void |
265 | reduce(char *dir) | 267 | reduce(char *dir) |
266 | Index: Python-2.7.9/Python/getplatform.c | 268 | Index: Python-2.7.12/Python/getplatform.c |
267 | =================================================================== | 269 | =================================================================== |
268 | --- Python-2.7.9.orig/Python/getplatform.c | 270 | --- Python-2.7.12.orig/Python/getplatform.c |
269 | +++ Python-2.7.9/Python/getplatform.c | 271 | +++ Python-2.7.12/Python/getplatform.c |
270 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) | 272 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) |
271 | { | 273 | { |
272 | return PLATFORM; | 274 | return PLATFORM; |
@@ -281,10 +283,10 @@ Index: Python-2.7.9/Python/getplatform.c | |||
281 | +{ | 283 | +{ |
282 | + return LIB; | 284 | + return LIB; |
283 | +} | 285 | +} |
284 | Index: Python-2.7.9/Python/sysmodule.c | 286 | Index: Python-2.7.12/Python/sysmodule.c |
285 | =================================================================== | 287 | =================================================================== |
286 | --- Python-2.7.9.orig/Python/sysmodule.c | 288 | --- Python-2.7.12.orig/Python/sysmodule.c |
287 | +++ Python-2.7.9/Python/sysmodule.c | 289 | +++ Python-2.7.12/Python/sysmodule.c |
288 | @@ -1437,6 +1437,8 @@ _PySys_Init(void) | 290 | @@ -1437,6 +1437,8 @@ _PySys_Init(void) |
289 | PyString_FromString(Py_GetCopyright())); | 291 | PyString_FromString(Py_GetCopyright())); |
290 | SET_SYS_FROM_STRING("platform", | 292 | SET_SYS_FROM_STRING("platform", |