diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/multilib.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/multilib.patch | 205 |
1 files changed, 122 insertions, 83 deletions
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch index df470f7c09..0bfa0d2cf4 100644 --- a/meta/recipes-devtools/python/python/multilib.patch +++ b/meta/recipes-devtools/python/python/multilib.patch | |||
@@ -1,26 +1,25 @@ | |||
1 | commit 248279e54467a8cd5cde98fc124d1d1384703513 | 1 | Rebased for python-2.7.9 |
2 | Author: Yu Ke <ke.yu@intel.com> | 2 | Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> |
3 | Date: Tue Jun 28 21:21:29 2011 +0800 | ||
4 | 3 | ||
5 | SUSE patch for the lib64 issue | 4 | Index: Python-2.7.9/configure.ac |
6 | |||
7 | see detail in http://bugs.python.org/issue1294959 | ||
8 | |||
9 | also rebased a bit for Yocto python 2.6.6 | ||
10 | |||
11 | Picked-by: Yu Ke <ke.yu@intel.com> | ||
12 | |||
13 | 2011/09/29 | ||
14 | Rebased for python 2.7.2 | ||
15 | |||
16 | Upstream-Status: Inappropriate [configuration] | ||
17 | |||
18 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
19 | |||
20 | Index: Python-2.7.2/Include/pythonrun.h | ||
21 | =================================================================== | 5 | =================================================================== |
22 | --- Python-2.7.2.orig/Include/pythonrun.h | 6 | --- Python-2.7.9.orig/configure.ac |
23 | +++ Python-2.7.2/Include/pythonrun.h | 7 | +++ Python-2.7.9/configure.ac |
8 | @@ -736,6 +736,10 @@ SunOS*) | ||
9 | ;; | ||
10 | esac | ||
11 | |||
12 | +AC_SUBST(LIB) | ||
13 | +AC_MSG_CHECKING(LIB) | ||
14 | +LIB=`basename ${libdir}` | ||
15 | +AC_MSG_RESULT($LIB) | ||
16 | |||
17 | AC_SUBST(LIBRARY) | ||
18 | AC_MSG_CHECKING(LIBRARY) | ||
19 | Index: Python-2.7.9/Include/pythonrun.h | ||
20 | =================================================================== | ||
21 | --- Python-2.7.9.orig/Include/pythonrun.h | ||
22 | +++ Python-2.7.9/Include/pythonrun.h | ||
24 | @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); | 23 | @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); |
25 | /* In their own files */ | 24 | /* In their own files */ |
26 | PyAPI_FUNC(const char *) Py_GetVersion(void); | 25 | PyAPI_FUNC(const char *) Py_GetVersion(void); |
@@ -29,10 +28,10 @@ Index: Python-2.7.2/Include/pythonrun.h | |||
29 | PyAPI_FUNC(const char *) Py_GetCopyright(void); | 28 | PyAPI_FUNC(const char *) Py_GetCopyright(void); |
30 | PyAPI_FUNC(const char *) Py_GetCompiler(void); | 29 | PyAPI_FUNC(const char *) Py_GetCompiler(void); |
31 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); | 30 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); |
32 | Index: Python-2.7.2/Lib/distutils/command/install.py | 31 | Index: Python-2.7.9/Lib/distutils/command/install.py |
33 | =================================================================== | 32 | =================================================================== |
34 | --- Python-2.7.2.orig/Lib/distutils/command/install.py | 33 | --- Python-2.7.9.orig/Lib/distutils/command/install.py |
35 | +++ Python-2.7.2/Lib/distutils/command/install.py | 34 | +++ Python-2.7.9/Lib/distutils/command/install.py |
36 | @@ -22,6 +22,8 @@ from site import USER_BASE | 35 | @@ -22,6 +22,8 @@ from site import USER_BASE |
37 | from site import USER_SITE | 36 | from site import USER_SITE |
38 | 37 | ||
@@ -51,11 +50,11 @@ Index: Python-2.7.2/Lib/distutils/command/install.py | |||
51 | 'headers': '$base/include/python$py_version_short/$dist_name', | 50 | 'headers': '$base/include/python$py_version_short/$dist_name', |
52 | 'scripts': '$base/bin', | 51 | 'scripts': '$base/bin', |
53 | 'data' : '$base', | 52 | 'data' : '$base', |
54 | Index: Python-2.7.2/Lib/distutils/sysconfig.py | 53 | Index: Python-2.7.9/Lib/distutils/sysconfig.py |
55 | =================================================================== | 54 | =================================================================== |
56 | --- Python-2.7.2.orig/Lib/distutils/sysconfig.py | 55 | --- Python-2.7.9.orig/Lib/distutils/sysconfig.py |
57 | +++ Python-2.7.2/Lib/distutils/sysconfig.py | 56 | +++ Python-2.7.9/Lib/distutils/sysconfig.py |
58 | @@ -114,8 +114,11 @@ def get_python_lib(plat_specific=0, stan | 57 | @@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan |
59 | prefix = plat_specific and EXEC_PREFIX or PREFIX | 58 | prefix = plat_specific and EXEC_PREFIX or PREFIX |
60 | 59 | ||
61 | if os.name == "posix": | 60 | if os.name == "posix": |
@@ -69,11 +68,11 @@ Index: Python-2.7.2/Lib/distutils/sysconfig.py | |||
69 | if standard_lib: | 68 | if standard_lib: |
70 | return libpython | 69 | return libpython |
71 | else: | 70 | else: |
72 | Index: Python-2.7.2/Lib/pydoc.py | 71 | Index: Python-2.7.9/Lib/pydoc.py |
73 | =================================================================== | 72 | =================================================================== |
74 | --- Python-2.7.2.orig/Lib/pydoc.py | 73 | --- Python-2.7.9.orig/Lib/pydoc.py |
75 | +++ Python-2.7.2/Lib/pydoc.py | 74 | +++ Python-2.7.9/Lib/pydoc.py |
76 | @@ -352,7 +352,7 @@ class Doc: | 75 | @@ -383,7 +383,7 @@ class Doc: |
77 | 76 | ||
78 | docloc = os.environ.get("PYTHONDOCS", | 77 | docloc = os.environ.get("PYTHONDOCS", |
79 | "http://docs.python.org/library") | 78 | "http://docs.python.org/library") |
@@ -82,11 +81,11 @@ Index: Python-2.7.2/Lib/pydoc.py | |||
82 | "python"+sys.version[0:3]) | 81 | "python"+sys.version[0:3]) |
83 | if (isinstance(object, type(os)) and | 82 | if (isinstance(object, type(os)) and |
84 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', | 83 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', |
85 | Index: Python-2.7.2/Lib/site.py | 84 | Index: Python-2.7.9/Lib/site.py |
86 | =================================================================== | 85 | =================================================================== |
87 | --- Python-2.7.2.orig/Lib/site.py | 86 | --- Python-2.7.9.orig/Lib/site.py |
88 | +++ Python-2.7.2/Lib/site.py | 87 | +++ Python-2.7.9/Lib/site.py |
89 | @@ -300,13 +300,19 @@ def getsitepackages(): | 88 | @@ -288,13 +288,18 @@ def getsitepackages(): |
90 | if sys.platform in ('os2emx', 'riscos'): | 89 | if sys.platform in ('os2emx', 'riscos'): |
91 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) | 90 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) |
92 | elif os.sep == '/': | 91 | elif os.sep == '/': |
@@ -95,12 +94,11 @@ Index: Python-2.7.2/Lib/site.py | |||
95 | "python" + sys.version[:3], | 94 | "python" + sys.version[:3], |
96 | "site-packages")) | 95 | "site-packages")) |
97 | - sitepackages.append(os.path.join(prefix, "lib", "site-python")) | 96 | - sitepackages.append(os.path.join(prefix, "lib", "site-python")) |
98 | + if sys.lib != "lib": | ||
99 | + sitepackages.append(os.path.join(prefix, "lib", | ||
100 | + "python" + sys.version[:3], | ||
101 | + "site-packages")) | ||
102 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) | 97 | + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) |
103 | + if sys.lib != "lib": | 98 | + if sys.lib != "lib": |
99 | + sitepackages.append(os.path.join(prefix, "lib", | ||
100 | + "python" + sys.version[:3], | ||
101 | + "site-packages")) | ||
104 | + sitepackages.append(os.path.join(prefix, "lib", "site-python")) | 102 | + sitepackages.append(os.path.join(prefix, "lib", "site-python")) |
105 | else: | 103 | else: |
106 | sitepackages.append(prefix) | 104 | sitepackages.append(prefix) |
@@ -109,11 +107,43 @@ Index: Python-2.7.2/Lib/site.py | |||
109 | if sys.platform == "darwin": | 107 | if sys.platform == "darwin": |
110 | # for framework builds *only* we add the standard Apple | 108 | # for framework builds *only* we add the standard Apple |
111 | # locations. | 109 | # locations. |
112 | Index: Python-2.7.2/Lib/test/test_dl.py | 110 | Index: Python-2.7.9/Lib/sysconfig.py |
111 | =================================================================== | ||
112 | --- Python-2.7.9.orig/Lib/sysconfig.py | ||
113 | +++ Python-2.7.9/Lib/sysconfig.py | ||
114 | @@ -7,10 +7,10 @@ from os.path import pardir, realpath | ||
115 | |||
116 | _INSTALL_SCHEMES = { | ||
117 | 'posix_prefix': { | ||
118 | - 'stdlib': '{base}/lib/python{py_version_short}', | ||
119 | - 'platstdlib': '{platbase}/lib/python{py_version_short}', | ||
120 | + 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', | ||
121 | + 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', | ||
122 | 'purelib': '{base}/lib/python{py_version_short}/site-packages', | ||
123 | - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', | ||
124 | + 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', | ||
125 | 'include': '{base}/include/python{py_version_short}', | ||
126 | 'platinclude': '{platbase}/include/python{py_version_short}', | ||
127 | 'scripts': '{base}/bin', | ||
128 | @@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { | ||
129 | 'data' : '{userbase}', | ||
130 | }, | ||
131 | 'posix_user': { | ||
132 | - 'stdlib': '{userbase}/lib/python{py_version_short}', | ||
133 | - 'platstdlib': '{userbase}/lib/python{py_version_short}', | ||
134 | + 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', | ||
135 | + 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', | ||
136 | 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', | ||
137 | - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', | ||
138 | + 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', | ||
139 | 'include': '{userbase}/include/python{py_version_short}', | ||
140 | 'scripts': '{userbase}/bin', | ||
141 | 'data' : '{userbase}', | ||
142 | Index: Python-2.7.9/Lib/test/test_dl.py | ||
113 | =================================================================== | 143 | =================================================================== |
114 | --- Python-2.7.2.orig/Lib/test/test_dl.py | 144 | --- Python-2.7.9.orig/Lib/test/test_dl.py |
115 | +++ Python-2.7.2/Lib/test/test_dl.py | 145 | +++ Python-2.7.9/Lib/test/test_dl.py |
116 | @@ -5,10 +5,11 @@ | 146 | @@ -4,10 +4,11 @@ |
117 | import unittest | 147 | import unittest |
118 | from test.test_support import verbose, import_module | 148 | from test.test_support import verbose, import_module |
119 | dl = import_module('dl', deprecated=True) | 149 | dl = import_module('dl', deprecated=True) |
@@ -127,11 +157,35 @@ Index: Python-2.7.2/Lib/test/test_dl.py | |||
127 | ('/usr/bin/cygwin1.dll', 'getpid'), | 157 | ('/usr/bin/cygwin1.dll', 'getpid'), |
128 | ('/usr/lib/libc.dylib', 'getpid'), | 158 | ('/usr/lib/libc.dylib', 'getpid'), |
129 | ] | 159 | ] |
130 | Index: Python-2.7.2/Lib/trace.py | 160 | Index: Python-2.7.9/Lib/test/test_site.py |
131 | =================================================================== | 161 | =================================================================== |
132 | --- Python-2.7.2.orig/Lib/trace.py | 162 | --- Python-2.7.9.orig/Lib/test/test_site.py |
133 | +++ Python-2.7.2/Lib/trace.py | 163 | +++ Python-2.7.9/Lib/test/test_site.py |
134 | @@ -762,10 +762,10 @@ def main(argv=None): | 164 | @@ -241,12 +241,16 @@ class HelperFunctionsTests(unittest.Test |
165 | self.assertEqual(dirs[2], wanted) | ||
166 | elif os.sep == '/': | ||
167 | # OS X non-framwework builds, Linux, FreeBSD, etc | ||
168 | - self.assertEqual(len(dirs), 2) | ||
169 | wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], | ||
170 | 'site-packages') | ||
171 | - self.assertEqual(dirs[0], wanted) | ||
172 | + self.assertTrue(wanted in dirs) | ||
173 | wanted = os.path.join('xoxo', 'lib', 'site-python') | ||
174 | - self.assertEqual(dirs[1], wanted) | ||
175 | + self.assertTrue(wanted in dirs) | ||
176 | + wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3], | ||
177 | + 'site-packages') | ||
178 | + self.assertTrue(wanted in dirs) | ||
179 | + wanted = os.path.join('xoxo', sys.lib, 'site-python') | ||
180 | + self.assertTrue(wanted in dirs) | ||
181 | else: | ||
182 | # other platforms | ||
183 | self.assertEqual(len(dirs), 2) | ||
184 | Index: Python-2.7.9/Lib/trace.py | ||
185 | =================================================================== | ||
186 | --- Python-2.7.9.orig/Lib/trace.py | ||
187 | +++ Python-2.7.9/Lib/trace.py | ||
188 | @@ -754,10 +754,10 @@ def main(argv=None): | ||
135 | # should I also call expanduser? (after all, could use $HOME) | 189 | # should I also call expanduser? (after all, could use $HOME) |
136 | 190 | ||
137 | s = s.replace("$prefix", | 191 | s = s.replace("$prefix", |
@@ -144,19 +198,19 @@ Index: Python-2.7.2/Lib/trace.py | |||
144 | "python" + sys.version[:3])) | 198 | "python" + sys.version[:3])) |
145 | s = os.path.normpath(s) | 199 | s = os.path.normpath(s) |
146 | ignore_dirs.append(s) | 200 | ignore_dirs.append(s) |
147 | Index: Python-2.7.2/Makefile.pre.in | 201 | Index: Python-2.7.9/Makefile.pre.in |
148 | =================================================================== | 202 | =================================================================== |
149 | --- Python-2.7.2.orig/Makefile.pre.in | 203 | --- Python-2.7.9.orig/Makefile.pre.in |
150 | +++ Python-2.7.2/Makefile.pre.in | 204 | +++ Python-2.7.9/Makefile.pre.in |
151 | @@ -81,6 +81,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG | 205 | @@ -87,6 +87,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG |
152 | 206 | ||
153 | # Machine-dependent subdirectories | 207 | # Machine-dependent subdirectories |
154 | MACHDEP= @MACHDEP@ | 208 | MACHDEP= @MACHDEP@ |
155 | +LIB= @LIB@ | 209 | +LIB= @LIB@ |
156 | 210 | ||
157 | # Install prefix for architecture-independent files | 211 | # Multiarch directory (may be empty) |
158 | prefix= @prefix@ | 212 | MULTIARCH= @MULTIARCH@ |
159 | @@ -97,7 +98,7 @@ LIBDIR= @libdir@ | 213 | @@ -106,7 +107,7 @@ LIBDIR= @libdir@ |
160 | MANDIR= @mandir@ | 214 | MANDIR= @mandir@ |
161 | INCLUDEDIR= @includedir@ | 215 | INCLUDEDIR= @includedir@ |
162 | CONFINCLUDEDIR= $(exec_prefix)/include | 216 | CONFINCLUDEDIR= $(exec_prefix)/include |
@@ -165,7 +219,7 @@ Index: Python-2.7.2/Makefile.pre.in | |||
165 | 219 | ||
166 | # Detailed destination directories | 220 | # Detailed destination directories |
167 | BINLIBDEST= $(LIBDIR)/python$(VERSION) | 221 | BINLIBDEST= $(LIBDIR)/python$(VERSION) |
168 | @@ -533,6 +534,7 @@ Modules/getpath.o: $(srcdir)/Modules/get | 222 | @@ -598,6 +599,7 @@ Modules/getpath.o: $(srcdir)/Modules/get |
169 | -DEXEC_PREFIX='"$(exec_prefix)"' \ | 223 | -DEXEC_PREFIX='"$(exec_prefix)"' \ |
170 | -DVERSION='"$(VERSION)"' \ | 224 | -DVERSION='"$(VERSION)"' \ |
171 | -DVPATH='"$(VPATH)"' \ | 225 | -DVPATH='"$(VPATH)"' \ |
@@ -173,7 +227,7 @@ Index: Python-2.7.2/Makefile.pre.in | |||
173 | -o $@ $(srcdir)/Modules/getpath.c | 227 | -o $@ $(srcdir)/Modules/getpath.c |
174 | 228 | ||
175 | Modules/python.o: $(srcdir)/Modules/python.c | 229 | Modules/python.o: $(srcdir)/Modules/python.c |
176 | @@ -567,7 +569,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) | 230 | @@ -640,7 +642,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) |
177 | 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) |
178 | 232 | ||
179 | Python/getplatform.o: $(srcdir)/Python/getplatform.c | 233 | Python/getplatform.o: $(srcdir)/Python/getplatform.c |
@@ -182,10 +236,10 @@ Index: Python-2.7.2/Makefile.pre.in | |||
182 | 236 | ||
183 | Python/importdl.o: $(srcdir)/Python/importdl.c | 237 | Python/importdl.o: $(srcdir)/Python/importdl.c |
184 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c | 238 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c |
185 | Index: Python-2.7.2/Modules/getpath.c | 239 | Index: Python-2.7.9/Modules/getpath.c |
186 | =================================================================== | 240 | =================================================================== |
187 | --- Python-2.7.2.orig/Modules/getpath.c | 241 | --- Python-2.7.9.orig/Modules/getpath.c |
188 | +++ Python-2.7.2/Modules/getpath.c | 242 | +++ Python-2.7.9/Modules/getpath.c |
189 | @@ -116,9 +116,11 @@ | 243 | @@ -116,9 +116,11 @@ |
190 | #define EXEC_PREFIX PREFIX | 244 | #define EXEC_PREFIX PREFIX |
191 | #endif | 245 | #endif |
@@ -209,10 +263,10 @@ Index: Python-2.7.2/Modules/getpath.c | |||
209 | 263 | ||
210 | static void | 264 | static void |
211 | reduce(char *dir) | 265 | reduce(char *dir) |
212 | Index: Python-2.7.2/Python/getplatform.c | 266 | Index: Python-2.7.9/Python/getplatform.c |
213 | =================================================================== | 267 | =================================================================== |
214 | --- Python-2.7.2.orig/Python/getplatform.c | 268 | --- Python-2.7.9.orig/Python/getplatform.c |
215 | +++ Python-2.7.2/Python/getplatform.c | 269 | +++ Python-2.7.9/Python/getplatform.c |
216 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) | 270 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) |
217 | { | 271 | { |
218 | return PLATFORM; | 272 | return PLATFORM; |
@@ -227,31 +281,16 @@ Index: Python-2.7.2/Python/getplatform.c | |||
227 | +{ | 281 | +{ |
228 | + return LIB; | 282 | + return LIB; |
229 | +} | 283 | +} |
230 | Index: Python-2.7.2/Python/sysmodule.c | 284 | Index: Python-2.7.9/Python/sysmodule.c |
231 | =================================================================== | 285 | =================================================================== |
232 | --- Python-2.7.2.orig/Python/sysmodule.c | 286 | --- Python-2.7.9.orig/Python/sysmodule.c |
233 | +++ Python-2.7.2/Python/sysmodule.c | 287 | +++ Python-2.7.9/Python/sysmodule.c |
234 | @@ -1416,6 +1416,8 @@ _PySys_Init(void) | 288 | @@ -1437,6 +1437,8 @@ _PySys_Init(void) |
235 | PyString_FromString(Py_GetCopyright())); | 289 | PyString_FromString(Py_GetCopyright())); |
236 | SET_SYS_FROM_STRING("platform", | 290 | SET_SYS_FROM_STRING("platform", |
237 | PyString_FromString(Py_GetPlatform())); | 291 | PyString_FromString(Py_GetPlatform())); |
238 | + SET_SYS_FROM_STRING("lib", | 292 | + SET_SYS_FROM_STRING("lib", |
239 | + PyString_FromString(Py_GetLib())); | 293 | + PyString_FromString(Py_GetLib())); |
240 | SET_SYS_FROM_STRING("executable", | 294 | SET_SYS_FROM_STRING("executable", |
241 | PyString_FromString(Py_GetProgramFullPath())); | 295 | PyString_FromString(Py_GetProgramFullPath())); |
242 | SET_SYS_FROM_STRING("prefix", | 296 | SET_SYS_FROM_STRING("prefix", |
243 | Index: Python-2.7.2/configure.in | ||
244 | =================================================================== | ||
245 | --- Python-2.7.2.orig/configure.in | ||
246 | +++ Python-2.7.2/configure.in | ||
247 | @@ -629,6 +629,10 @@ SunOS*) | ||
248 | ;; | ||
249 | esac | ||
250 | |||
251 | +AC_SUBST(LIB) | ||
252 | +AC_MSG_CHECKING(LIB) | ||
253 | +LIB=`basename ${libdir}` | ||
254 | +AC_MSG_RESULT($LIB) | ||
255 | |||
256 | AC_SUBST(LIBRARY) | ||
257 | AC_MSG_CHECKING(LIBRARY) | ||