diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/multilib.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/multilib.patch | 126 |
1 files changed, 65 insertions, 61 deletions
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch index 33a334189e..babff1280e 100644 --- a/meta/recipes-devtools/python/python/multilib.patch +++ b/meta/recipes-devtools/python/python/multilib.patch | |||
@@ -10,10 +10,14 @@ Date: Tue Jun 28 21:21:29 2011 +0800 | |||
10 | 10 | ||
11 | Picked-by: Yu Ke <ke.yu@intel.com> | 11 | Picked-by: Yu Ke <ke.yu@intel.com> |
12 | 12 | ||
13 | Index: Python-2.6.6/Include/pythonrun.h | 13 | 2011/09/29 |
14 | Rebased for python 2.7.2 | ||
15 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
16 | |||
17 | Index: Python-2.7.2/Include/pythonrun.h | ||
14 | =================================================================== | 18 | =================================================================== |
15 | --- Python-2.6.6.orig/Include/pythonrun.h | 19 | --- Python-2.7.2.orig/Include/pythonrun.h |
16 | +++ Python-2.6.6/Include/pythonrun.h | 20 | +++ Python-2.7.2/Include/pythonrun.h |
17 | @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); | 21 | @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); |
18 | /* In their own files */ | 22 | /* In their own files */ |
19 | PyAPI_FUNC(const char *) Py_GetVersion(void); | 23 | PyAPI_FUNC(const char *) Py_GetVersion(void); |
@@ -22,10 +26,10 @@ Index: Python-2.6.6/Include/pythonrun.h | |||
22 | PyAPI_FUNC(const char *) Py_GetCopyright(void); | 26 | PyAPI_FUNC(const char *) Py_GetCopyright(void); |
23 | PyAPI_FUNC(const char *) Py_GetCompiler(void); | 27 | PyAPI_FUNC(const char *) Py_GetCompiler(void); |
24 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); | 28 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); |
25 | Index: Python-2.6.6/Lib/distutils/command/install.py | 29 | Index: Python-2.7.2/Lib/distutils/command/install.py |
26 | =================================================================== | 30 | =================================================================== |
27 | --- Python-2.6.6.orig/Lib/distutils/command/install.py | 31 | --- Python-2.7.2.orig/Lib/distutils/command/install.py |
28 | +++ Python-2.6.6/Lib/distutils/command/install.py | 32 | +++ Python-2.7.2/Lib/distutils/command/install.py |
29 | @@ -22,6 +22,8 @@ from site import USER_BASE | 33 | @@ -22,6 +22,8 @@ from site import USER_BASE |
30 | from site import USER_SITE | 34 | from site import USER_SITE |
31 | 35 | ||
@@ -44,11 +48,11 @@ Index: Python-2.6.6/Lib/distutils/command/install.py | |||
44 | 'headers': '$base/include/python$py_version_short/$dist_name', | 48 | 'headers': '$base/include/python$py_version_short/$dist_name', |
45 | 'scripts': '$base/bin', | 49 | 'scripts': '$base/bin', |
46 | 'data' : '$base', | 50 | 'data' : '$base', |
47 | Index: Python-2.6.6/Lib/distutils/sysconfig.py | 51 | Index: Python-2.7.2/Lib/distutils/sysconfig.py |
48 | =================================================================== | 52 | =================================================================== |
49 | --- Python-2.6.6.orig/Lib/distutils/sysconfig.py | 53 | --- Python-2.7.2.orig/Lib/distutils/sysconfig.py |
50 | +++ Python-2.6.6/Lib/distutils/sysconfig.py | 54 | +++ Python-2.7.2/Lib/distutils/sysconfig.py |
51 | @@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan | 55 | @@ -114,8 +114,11 @@ def get_python_lib(plat_specific=0, stan |
52 | prefix = plat_specific and EXEC_PREFIX or PREFIX | 56 | prefix = plat_specific and EXEC_PREFIX or PREFIX |
53 | 57 | ||
54 | if os.name == "posix": | 58 | if os.name == "posix": |
@@ -62,11 +66,11 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py | |||
62 | if standard_lib: | 66 | if standard_lib: |
63 | return libpython | 67 | return libpython |
64 | else: | 68 | else: |
65 | Index: Python-2.6.6/Lib/pydoc.py | 69 | Index: Python-2.7.2/Lib/pydoc.py |
66 | =================================================================== | 70 | =================================================================== |
67 | --- Python-2.6.6.orig/Lib/pydoc.py | 71 | --- Python-2.7.2.orig/Lib/pydoc.py |
68 | +++ Python-2.6.6/Lib/pydoc.py | 72 | +++ Python-2.7.2/Lib/pydoc.py |
69 | @@ -349,7 +349,7 @@ class Doc: | 73 | @@ -352,7 +352,7 @@ class Doc: |
70 | 74 | ||
71 | docloc = os.environ.get("PYTHONDOCS", | 75 | docloc = os.environ.get("PYTHONDOCS", |
72 | "http://docs.python.org/library") | 76 | "http://docs.python.org/library") |
@@ -75,40 +79,40 @@ Index: Python-2.6.6/Lib/pydoc.py | |||
75 | "python"+sys.version[0:3]) | 79 | "python"+sys.version[0:3]) |
76 | if (isinstance(object, type(os)) and | 80 | if (isinstance(object, type(os)) and |
77 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', | 81 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', |
78 | Index: Python-2.6.6/Lib/site.py | 82 | Index: Python-2.7.2/Lib/site.py |
79 | =================================================================== | 83 | =================================================================== |
80 | --- Python-2.6.6.orig/Lib/site.py | 84 | --- Python-2.7.2.orig/Lib/site.py |
81 | +++ Python-2.6.6/Lib/site.py | 85 | +++ Python-2.7.2/Lib/site.py |
82 | @@ -265,13 +265,19 @@ def addsitepackages(known_paths): | 86 | @@ -300,13 +300,19 @@ def getsitepackages(): |
83 | if sys.platform in ('os2emx', 'riscos'): | 87 | if sys.platform in ('os2emx', 'riscos'): |
84 | sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) | 88 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) |
85 | elif os.sep == '/': | 89 | elif os.sep == '/': |
86 | - sitedirs.append(os.path.join(prefix, "lib", | 90 | - sitepackages.append(os.path.join(prefix, "lib", |
87 | + sitedirs.append(os.path.join(prefix, sys.lib, | 91 | + sitepackages.append(os.path.join(prefix, sys.lib, |
88 | "python" + sys.version[:3], | 92 | "python" + sys.version[:3], |
89 | "site-packages")) | 93 | "site-packages")) |
90 | - sitedirs.append(os.path.join(prefix, "lib", "site-python")) | 94 | - sitepackages.append(os.path.join(prefix, "lib", "site-python")) |
91 | + if sys.lib != "lib": | 95 | + if sys.lib != "lib": |
92 | + sitedirs.append(os.path.join(prefix, "lib", | 96 | + sitepackages.append(os.path.join(prefix, "lib", |
93 | + "python" + sys.version[:3], | 97 | + "python" + sys.version[:3], |
94 | + "site-packages")) | 98 | + "site-packages")) |
95 | + sitedirs.append(os.path.join(prefix, sys.lib, "site-python")) | 99 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) |
96 | + if sys.lib != "lib": | 100 | + if sys.lib != "lib": |
97 | + sitedirs.append(os.path.join(prefix, "lib", "site-python")) | 101 | + sitepackages.append(os.path.join(prefix, "lib", "site-python")) |
98 | else: | 102 | else: |
99 | sitedirs.append(prefix) | 103 | sitepackages.append(prefix) |
100 | - sitedirs.append(os.path.join(prefix, "lib", "site-packages")) | 104 | - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) |
101 | + sitedirs.append(os.path.join(prefix, sys.lib, "site-packages")) | 105 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) |
102 | |||
103 | if sys.platform == "darwin": | 106 | if sys.platform == "darwin": |
104 | # for framework builds *only* we add the standard Apple | 107 | # for framework builds *only* we add the standard Apple |
105 | Index: Python-2.6.6/Lib/test/test_dl.py | 108 | # locations. |
109 | Index: Python-2.7.2/Lib/test/test_dl.py | ||
106 | =================================================================== | 110 | =================================================================== |
107 | --- Python-2.6.6.orig/Lib/test/test_dl.py | 111 | --- Python-2.7.2.orig/Lib/test/test_dl.py |
108 | +++ Python-2.6.6/Lib/test/test_dl.py | 112 | +++ Python-2.7.2/Lib/test/test_dl.py |
109 | @@ -4,10 +4,11 @@ | 113 | @@ -5,10 +5,11 @@ |
110 | """ | 114 | import unittest |
111 | from test.test_support import verbose,TestSkipped, import_module | 115 | from test.test_support import verbose, import_module |
112 | dl = import_module('dl', deprecated=True) | 116 | dl = import_module('dl', deprecated=True) |
113 | +import sys | 117 | +import sys |
114 | 118 | ||
@@ -120,11 +124,11 @@ Index: Python-2.6.6/Lib/test/test_dl.py | |||
120 | ('/usr/bin/cygwin1.dll', 'getpid'), | 124 | ('/usr/bin/cygwin1.dll', 'getpid'), |
121 | ('/usr/lib/libc.dylib', 'getpid'), | 125 | ('/usr/lib/libc.dylib', 'getpid'), |
122 | ] | 126 | ] |
123 | Index: Python-2.6.6/Lib/trace.py | 127 | Index: Python-2.7.2/Lib/trace.py |
124 | =================================================================== | 128 | =================================================================== |
125 | --- Python-2.6.6.orig/Lib/trace.py | 129 | --- Python-2.7.2.orig/Lib/trace.py |
126 | +++ Python-2.6.6/Lib/trace.py | 130 | +++ Python-2.7.2/Lib/trace.py |
127 | @@ -759,10 +759,10 @@ def main(argv=None): | 131 | @@ -762,10 +762,10 @@ def main(argv=None): |
128 | # should I also call expanduser? (after all, could use $HOME) | 132 | # should I also call expanduser? (after all, could use $HOME) |
129 | 133 | ||
130 | s = s.replace("$prefix", | 134 | s = s.replace("$prefix", |
@@ -137,11 +141,11 @@ Index: Python-2.6.6/Lib/trace.py | |||
137 | "python" + sys.version[:3])) | 141 | "python" + sys.version[:3])) |
138 | s = os.path.normpath(s) | 142 | s = os.path.normpath(s) |
139 | ignore_dirs.append(s) | 143 | ignore_dirs.append(s) |
140 | Index: Python-2.6.6/Makefile.pre.in | 144 | Index: Python-2.7.2/Makefile.pre.in |
141 | =================================================================== | 145 | =================================================================== |
142 | --- Python-2.6.6.orig/Makefile.pre.in | 146 | --- Python-2.7.2.orig/Makefile.pre.in |
143 | +++ Python-2.6.6/Makefile.pre.in | 147 | +++ Python-2.7.2/Makefile.pre.in |
144 | @@ -75,6 +75,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG | 148 | @@ -81,6 +81,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG |
145 | 149 | ||
146 | # Machine-dependent subdirectories | 150 | # Machine-dependent subdirectories |
147 | MACHDEP= @MACHDEP@ | 151 | MACHDEP= @MACHDEP@ |
@@ -149,7 +153,7 @@ Index: Python-2.6.6/Makefile.pre.in | |||
149 | 153 | ||
150 | # Install prefix for architecture-independent files | 154 | # Install prefix for architecture-independent files |
151 | prefix= @prefix@ | 155 | prefix= @prefix@ |
152 | @@ -91,7 +92,7 @@ LIBDIR= @libdir@ | 156 | @@ -97,7 +98,7 @@ LIBDIR= @libdir@ |
153 | MANDIR= @mandir@ | 157 | MANDIR= @mandir@ |
154 | INCLUDEDIR= @includedir@ | 158 | INCLUDEDIR= @includedir@ |
155 | CONFINCLUDEDIR= $(exec_prefix)/include | 159 | CONFINCLUDEDIR= $(exec_prefix)/include |
@@ -158,7 +162,7 @@ Index: Python-2.6.6/Makefile.pre.in | |||
158 | 162 | ||
159 | # Detailed destination directories | 163 | # Detailed destination directories |
160 | BINLIBDEST= $(LIBDIR)/python$(VERSION) | 164 | BINLIBDEST= $(LIBDIR)/python$(VERSION) |
161 | @@ -509,6 +510,7 @@ Modules/getpath.o: $(srcdir)/Modules/get | 165 | @@ -533,6 +534,7 @@ Modules/getpath.o: $(srcdir)/Modules/get |
162 | -DEXEC_PREFIX='"$(exec_prefix)"' \ | 166 | -DEXEC_PREFIX='"$(exec_prefix)"' \ |
163 | -DVERSION='"$(VERSION)"' \ | 167 | -DVERSION='"$(VERSION)"' \ |
164 | -DVPATH='"$(VPATH)"' \ | 168 | -DVPATH='"$(VPATH)"' \ |
@@ -166,8 +170,8 @@ Index: Python-2.6.6/Makefile.pre.in | |||
166 | -o $@ $(srcdir)/Modules/getpath.c | 170 | -o $@ $(srcdir)/Modules/getpath.c |
167 | 171 | ||
168 | Modules/python.o: $(srcdir)/Modules/python.c | 172 | Modules/python.o: $(srcdir)/Modules/python.c |
169 | @@ -540,7 +542,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) | 173 | @@ -567,7 +569,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) |
170 | Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H) | 174 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) |
171 | 175 | ||
172 | Python/getplatform.o: $(srcdir)/Python/getplatform.c | 176 | Python/getplatform.o: $(srcdir)/Python/getplatform.c |
173 | - $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c | 177 | - $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c |
@@ -175,10 +179,10 @@ Index: Python-2.6.6/Makefile.pre.in | |||
175 | 179 | ||
176 | Python/importdl.o: $(srcdir)/Python/importdl.c | 180 | Python/importdl.o: $(srcdir)/Python/importdl.c |
177 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c | 181 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c |
178 | Index: Python-2.6.6/Modules/getpath.c | 182 | Index: Python-2.7.2/Modules/getpath.c |
179 | =================================================================== | 183 | =================================================================== |
180 | --- Python-2.6.6.orig/Modules/getpath.c | 184 | --- Python-2.7.2.orig/Modules/getpath.c |
181 | +++ Python-2.6.6/Modules/getpath.c | 185 | +++ Python-2.7.2/Modules/getpath.c |
182 | @@ -116,9 +116,11 @@ | 186 | @@ -116,9 +116,11 @@ |
183 | #define EXEC_PREFIX PREFIX | 187 | #define EXEC_PREFIX PREFIX |
184 | #endif | 188 | #endif |
@@ -202,10 +206,10 @@ Index: Python-2.6.6/Modules/getpath.c | |||
202 | 206 | ||
203 | static void | 207 | static void |
204 | reduce(char *dir) | 208 | reduce(char *dir) |
205 | Index: Python-2.6.6/Python/getplatform.c | 209 | Index: Python-2.7.2/Python/getplatform.c |
206 | =================================================================== | 210 | =================================================================== |
207 | --- Python-2.6.6.orig/Python/getplatform.c | 211 | --- Python-2.7.2.orig/Python/getplatform.c |
208 | +++ Python-2.6.6/Python/getplatform.c | 212 | +++ Python-2.7.2/Python/getplatform.c |
209 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) | 213 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) |
210 | { | 214 | { |
211 | return PLATFORM; | 215 | return PLATFORM; |
@@ -220,11 +224,11 @@ Index: Python-2.6.6/Python/getplatform.c | |||
220 | +{ | 224 | +{ |
221 | + return LIB; | 225 | + return LIB; |
222 | +} | 226 | +} |
223 | Index: Python-2.6.6/Python/sysmodule.c | 227 | Index: Python-2.7.2/Python/sysmodule.c |
224 | =================================================================== | 228 | =================================================================== |
225 | --- Python-2.6.6.orig/Python/sysmodule.c | 229 | --- Python-2.7.2.orig/Python/sysmodule.c |
226 | +++ Python-2.6.6/Python/sysmodule.c | 230 | +++ Python-2.7.2/Python/sysmodule.c |
227 | @@ -1379,6 +1379,8 @@ _PySys_Init(void) | 231 | @@ -1416,6 +1416,8 @@ _PySys_Init(void) |
228 | PyString_FromString(Py_GetCopyright())); | 232 | PyString_FromString(Py_GetCopyright())); |
229 | SET_SYS_FROM_STRING("platform", | 233 | SET_SYS_FROM_STRING("platform", |
230 | PyString_FromString(Py_GetPlatform())); | 234 | PyString_FromString(Py_GetPlatform())); |
@@ -233,11 +237,11 @@ Index: Python-2.6.6/Python/sysmodule.c | |||
233 | SET_SYS_FROM_STRING("executable", | 237 | SET_SYS_FROM_STRING("executable", |
234 | PyString_FromString(Py_GetProgramFullPath())); | 238 | PyString_FromString(Py_GetProgramFullPath())); |
235 | SET_SYS_FROM_STRING("prefix", | 239 | SET_SYS_FROM_STRING("prefix", |
236 | Index: Python-2.6.6/configure.in | 240 | Index: Python-2.7.2/configure.in |
237 | =================================================================== | 241 | =================================================================== |
238 | --- Python-2.6.6.orig/configure.in | 242 | --- Python-2.7.2.orig/configure.in |
239 | +++ Python-2.6.6/configure.in | 243 | +++ Python-2.7.2/configure.in |
240 | @@ -613,6 +613,10 @@ SunOS*) | 244 | @@ -629,6 +629,10 @@ SunOS*) |
241 | ;; | 245 | ;; |
242 | esac | 246 | esac |
243 | 247 | ||