diff options
Diffstat (limited to 'meta/recipes-devtools/python/python-native/multilib.patch')
-rw-r--r-- | meta/recipes-devtools/python/python-native/multilib.patch | 104 |
1 files changed, 48 insertions, 56 deletions
diff --git a/meta/recipes-devtools/python/python-native/multilib.patch b/meta/recipes-devtools/python/python-native/multilib.patch index 0526031ada..8ca89e7c51 100644 --- a/meta/recipes-devtools/python/python-native/multilib.patch +++ b/meta/recipes-devtools/python/python-native/multilib.patch | |||
@@ -1,15 +1,6 @@ | |||
1 | commit 248279e54467a8cd5cde98fc124d1d1384703513 | 1 | Rebased for Python 2.7.9 |
2 | Author: Yu Ke <ke.yu@intel.com> | ||
3 | Date: Tue Jun 28 21:21:29 2011 +0800 | ||
4 | |||
5 | SUSE patch for the lib64 issue | ||
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 | 2 | ||
3 | Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
13 | 4 | ||
14 | 2011/09/29 | 5 | 2011/09/29 |
15 | The python recipe building was failing because python-native | 6 | The python recipe building was failing because python-native |
@@ -21,10 +12,10 @@ Upstream-Status: Inappropriate [oe-specific] | |||
21 | 12 | ||
22 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | 13 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> |
23 | 14 | ||
24 | Index: Python-2.7.2/Include/pythonrun.h | 15 | Index: Python-2.7.9/Include/pythonrun.h |
25 | =================================================================== | 16 | =================================================================== |
26 | --- Python-2.7.2.orig/Include/pythonrun.h | 17 | --- Python-2.7.9.orig/Include/pythonrun.h |
27 | +++ Python-2.7.2/Include/pythonrun.h | 18 | +++ Python-2.7.9/Include/pythonrun.h |
28 | @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); | 19 | @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); |
29 | /* In their own files */ | 20 | /* In their own files */ |
30 | PyAPI_FUNC(const char *) Py_GetVersion(void); | 21 | PyAPI_FUNC(const char *) Py_GetVersion(void); |
@@ -33,10 +24,10 @@ Index: Python-2.7.2/Include/pythonrun.h | |||
33 | PyAPI_FUNC(const char *) Py_GetCopyright(void); | 24 | PyAPI_FUNC(const char *) Py_GetCopyright(void); |
34 | PyAPI_FUNC(const char *) Py_GetCompiler(void); | 25 | PyAPI_FUNC(const char *) Py_GetCompiler(void); |
35 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); | 26 | PyAPI_FUNC(const char *) Py_GetBuildInfo(void); |
36 | Index: Python-2.7.2/Lib/distutils/command/install.py | 27 | Index: Python-2.7.9/Lib/distutils/command/install.py |
37 | =================================================================== | 28 | =================================================================== |
38 | --- Python-2.7.2.orig/Lib/distutils/command/install.py | 29 | --- Python-2.7.9.orig/Lib/distutils/command/install.py |
39 | +++ Python-2.7.2/Lib/distutils/command/install.py | 30 | +++ Python-2.7.9/Lib/distutils/command/install.py |
40 | @@ -22,6 +22,8 @@ from site import USER_BASE | 31 | @@ -22,6 +22,8 @@ from site import USER_BASE |
41 | from site import USER_SITE | 32 | from site import USER_SITE |
42 | 33 | ||
@@ -55,11 +46,11 @@ Index: Python-2.7.2/Lib/distutils/command/install.py | |||
55 | 'headers': '$base/include/python$py_version_short/$dist_name', | 46 | 'headers': '$base/include/python$py_version_short/$dist_name', |
56 | 'scripts': '$base/bin', | 47 | 'scripts': '$base/bin', |
57 | 'data' : '$base', | 48 | 'data' : '$base', |
58 | Index: Python-2.7.2/Lib/pydoc.py | 49 | Index: Python-2.7.9/Lib/pydoc.py |
59 | =================================================================== | 50 | =================================================================== |
60 | --- Python-2.7.2.orig/Lib/pydoc.py | 51 | --- Python-2.7.9.orig/Lib/pydoc.py |
61 | +++ Python-2.7.2/Lib/pydoc.py | 52 | +++ Python-2.7.9/Lib/pydoc.py |
62 | @@ -352,7 +352,7 @@ class Doc: | 53 | @@ -383,7 +383,7 @@ class Doc: |
63 | 54 | ||
64 | docloc = os.environ.get("PYTHONDOCS", | 55 | docloc = os.environ.get("PYTHONDOCS", |
65 | "http://docs.python.org/library") | 56 | "http://docs.python.org/library") |
@@ -68,11 +59,11 @@ Index: Python-2.7.2/Lib/pydoc.py | |||
68 | "python"+sys.version[0:3]) | 59 | "python"+sys.version[0:3]) |
69 | if (isinstance(object, type(os)) and | 60 | if (isinstance(object, type(os)) and |
70 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', | 61 | (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', |
71 | Index: Python-2.7.2/Lib/site.py | 62 | Index: Python-2.7.9/Lib/site.py |
72 | =================================================================== | 63 | =================================================================== |
73 | --- Python-2.7.2.orig/Lib/site.py | 64 | --- Python-2.7.9.orig/Lib/site.py |
74 | +++ Python-2.7.2/Lib/site.py | 65 | +++ Python-2.7.9/Lib/site.py |
75 | @@ -300,13 +300,19 @@ def getsitepackages(): | 66 | @@ -288,13 +288,19 @@ def getsitepackages(): |
76 | if sys.platform in ('os2emx', 'riscos'): | 67 | if sys.platform in ('os2emx', 'riscos'): |
77 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) | 68 | sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) |
78 | elif os.sep == '/': | 69 | elif os.sep == '/': |
@@ -95,11 +86,11 @@ Index: Python-2.7.2/Lib/site.py | |||
95 | if sys.platform == "darwin": | 86 | if sys.platform == "darwin": |
96 | # for framework builds *only* we add the standard Apple | 87 | # for framework builds *only* we add the standard Apple |
97 | # locations. | 88 | # locations. |
98 | Index: Python-2.7.2/Lib/test/test_dl.py | 89 | Index: Python-2.7.9/Lib/test/test_dl.py |
99 | =================================================================== | 90 | =================================================================== |
100 | --- Python-2.7.2.orig/Lib/test/test_dl.py | 91 | --- Python-2.7.9.orig/Lib/test/test_dl.py |
101 | +++ Python-2.7.2/Lib/test/test_dl.py | 92 | +++ Python-2.7.9/Lib/test/test_dl.py |
102 | @@ -5,10 +5,11 @@ | 93 | @@ -4,10 +4,11 @@ |
103 | import unittest | 94 | import unittest |
104 | from test.test_support import verbose, import_module | 95 | from test.test_support import verbose, import_module |
105 | dl = import_module('dl', deprecated=True) | 96 | dl = import_module('dl', deprecated=True) |
@@ -113,11 +104,11 @@ Index: Python-2.7.2/Lib/test/test_dl.py | |||
113 | ('/usr/bin/cygwin1.dll', 'getpid'), | 104 | ('/usr/bin/cygwin1.dll', 'getpid'), |
114 | ('/usr/lib/libc.dylib', 'getpid'), | 105 | ('/usr/lib/libc.dylib', 'getpid'), |
115 | ] | 106 | ] |
116 | Index: Python-2.7.2/Lib/trace.py | 107 | Index: Python-2.7.9/Lib/trace.py |
117 | =================================================================== | 108 | =================================================================== |
118 | --- Python-2.7.2.orig/Lib/trace.py | 109 | --- Python-2.7.9.orig/Lib/trace.py |
119 | +++ Python-2.7.2/Lib/trace.py | 110 | +++ Python-2.7.9/Lib/trace.py |
120 | @@ -762,10 +762,10 @@ def main(argv=None): | 111 | @@ -754,10 +754,10 @@ def main(argv=None): |
121 | # should I also call expanduser? (after all, could use $HOME) | 112 | # should I also call expanduser? (after all, could use $HOME) |
122 | 113 | ||
123 | s = s.replace("$prefix", | 114 | s = s.replace("$prefix", |
@@ -130,19 +121,19 @@ Index: Python-2.7.2/Lib/trace.py | |||
130 | "python" + sys.version[:3])) | 121 | "python" + sys.version[:3])) |
131 | s = os.path.normpath(s) | 122 | s = os.path.normpath(s) |
132 | ignore_dirs.append(s) | 123 | ignore_dirs.append(s) |
133 | Index: Python-2.7.2/Makefile.pre.in | 124 | Index: Python-2.7.9/Makefile.pre.in |
134 | =================================================================== | 125 | =================================================================== |
135 | --- Python-2.7.2.orig/Makefile.pre.in | 126 | --- Python-2.7.9.orig/Makefile.pre.in |
136 | +++ Python-2.7.2/Makefile.pre.in | 127 | +++ Python-2.7.9/Makefile.pre.in |
137 | @@ -81,6 +81,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG | 128 | @@ -87,6 +87,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG |
138 | 129 | ||
139 | # Machine-dependent subdirectories | 130 | # Machine-dependent subdirectories |
140 | MACHDEP= @MACHDEP@ | 131 | MACHDEP= @MACHDEP@ |
141 | +LIB= @LIB@ | 132 | +LIB= @LIB@ |
142 | 133 | ||
143 | # Install prefix for architecture-independent files | 134 | # Multiarch directory (may be empty) |
144 | prefix= @prefix@ | 135 | MULTIARCH= @MULTIARCH@ |
145 | @@ -97,7 +98,7 @@ LIBDIR= @libdir@ | 136 | @@ -106,7 +107,7 @@ LIBDIR= @libdir@ |
146 | MANDIR= @mandir@ | 137 | MANDIR= @mandir@ |
147 | INCLUDEDIR= @includedir@ | 138 | INCLUDEDIR= @includedir@ |
148 | CONFINCLUDEDIR= $(exec_prefix)/include | 139 | CONFINCLUDEDIR= $(exec_prefix)/include |
@@ -151,7 +142,7 @@ Index: Python-2.7.2/Makefile.pre.in | |||
151 | 142 | ||
152 | # Detailed destination directories | 143 | # Detailed destination directories |
153 | BINLIBDEST= $(LIBDIR)/python$(VERSION) | 144 | BINLIBDEST= $(LIBDIR)/python$(VERSION) |
154 | @@ -532,6 +533,7 @@ Modules/getpath.o: $(srcdir)/Modules/get | 145 | @@ -597,6 +598,7 @@ Modules/getpath.o: $(srcdir)/Modules/get |
155 | -DEXEC_PREFIX='"$(exec_prefix)"' \ | 146 | -DEXEC_PREFIX='"$(exec_prefix)"' \ |
156 | -DVERSION='"$(VERSION)"' \ | 147 | -DVERSION='"$(VERSION)"' \ |
157 | -DVPATH='"$(VPATH)"' \ | 148 | -DVPATH='"$(VPATH)"' \ |
@@ -159,7 +150,7 @@ Index: Python-2.7.2/Makefile.pre.in | |||
159 | -o $@ $(srcdir)/Modules/getpath.c | 150 | -o $@ $(srcdir)/Modules/getpath.c |
160 | 151 | ||
161 | Modules/python.o: $(srcdir)/Modules/python.c | 152 | Modules/python.o: $(srcdir)/Modules/python.c |
162 | @@ -566,7 +568,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) | 153 | @@ -639,7 +641,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) |
163 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) | 154 | Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) |
164 | 155 | ||
165 | Python/getplatform.o: $(srcdir)/Python/getplatform.c | 156 | Python/getplatform.o: $(srcdir)/Python/getplatform.c |
@@ -168,10 +159,10 @@ Index: Python-2.7.2/Makefile.pre.in | |||
168 | 159 | ||
169 | Python/importdl.o: $(srcdir)/Python/importdl.c | 160 | Python/importdl.o: $(srcdir)/Python/importdl.c |
170 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c | 161 | $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c |
171 | Index: Python-2.7.2/Modules/getpath.c | 162 | Index: Python-2.7.9/Modules/getpath.c |
172 | =================================================================== | 163 | =================================================================== |
173 | --- Python-2.7.2.orig/Modules/getpath.c | 164 | --- Python-2.7.9.orig/Modules/getpath.c |
174 | +++ Python-2.7.2/Modules/getpath.c | 165 | +++ Python-2.7.9/Modules/getpath.c |
175 | @@ -116,9 +116,11 @@ | 166 | @@ -116,9 +116,11 @@ |
176 | #define EXEC_PREFIX PREFIX | 167 | #define EXEC_PREFIX PREFIX |
177 | #endif | 168 | #endif |
@@ -195,10 +186,10 @@ Index: Python-2.7.2/Modules/getpath.c | |||
195 | 186 | ||
196 | static void | 187 | static void |
197 | reduce(char *dir) | 188 | reduce(char *dir) |
198 | Index: Python-2.7.2/Python/getplatform.c | 189 | Index: Python-2.7.9/Python/getplatform.c |
199 | =================================================================== | 190 | =================================================================== |
200 | --- Python-2.7.2.orig/Python/getplatform.c | 191 | --- Python-2.7.9.orig/Python/getplatform.c |
201 | +++ Python-2.7.2/Python/getplatform.c | 192 | +++ Python-2.7.9/Python/getplatform.c |
202 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) | 193 | @@ -10,3 +10,13 @@ Py_GetPlatform(void) |
203 | { | 194 | { |
204 | return PLATFORM; | 195 | return PLATFORM; |
@@ -213,11 +204,11 @@ Index: Python-2.7.2/Python/getplatform.c | |||
213 | +{ | 204 | +{ |
214 | + return LIB; | 205 | + return LIB; |
215 | +} | 206 | +} |
216 | Index: Python-2.7.2/Python/sysmodule.c | 207 | Index: Python-2.7.9/Python/sysmodule.c |
217 | =================================================================== | 208 | =================================================================== |
218 | --- Python-2.7.2.orig/Python/sysmodule.c | 209 | --- Python-2.7.9.orig/Python/sysmodule.c |
219 | +++ Python-2.7.2/Python/sysmodule.c | 210 | +++ Python-2.7.9/Python/sysmodule.c |
220 | @@ -1416,6 +1416,8 @@ _PySys_Init(void) | 211 | @@ -1437,6 +1437,8 @@ _PySys_Init(void) |
221 | PyString_FromString(Py_GetCopyright())); | 212 | PyString_FromString(Py_GetCopyright())); |
222 | SET_SYS_FROM_STRING("platform", | 213 | SET_SYS_FROM_STRING("platform", |
223 | PyString_FromString(Py_GetPlatform())); | 214 | PyString_FromString(Py_GetPlatform())); |
@@ -226,11 +217,11 @@ Index: Python-2.7.2/Python/sysmodule.c | |||
226 | SET_SYS_FROM_STRING("executable", | 217 | SET_SYS_FROM_STRING("executable", |
227 | PyString_FromString(Py_GetProgramFullPath())); | 218 | PyString_FromString(Py_GetProgramFullPath())); |
228 | SET_SYS_FROM_STRING("prefix", | 219 | SET_SYS_FROM_STRING("prefix", |
229 | Index: Python-2.7.2/configure.in | 220 | Index: Python-2.7.9/configure.ac |
230 | =================================================================== | 221 | =================================================================== |
231 | --- Python-2.7.2.orig/configure.in | 222 | --- Python-2.7.9.orig/configure.ac |
232 | +++ Python-2.7.2/configure.in | 223 | +++ Python-2.7.9/configure.ac |
233 | @@ -629,6 +629,10 @@ SunOS*) | 224 | @@ -736,6 +736,11 @@ SunOS*) |
234 | ;; | 225 | ;; |
235 | esac | 226 | esac |
236 | 227 | ||
@@ -238,6 +229,7 @@ Index: Python-2.7.2/configure.in | |||
238 | +AC_MSG_CHECKING(LIB) | 229 | +AC_MSG_CHECKING(LIB) |
239 | +LIB=`basename ${libdir}` | 230 | +LIB=`basename ${libdir}` |
240 | +AC_MSG_RESULT($LIB) | 231 | +AC_MSG_RESULT($LIB) |
232 | + | ||
241 | 233 | ||
242 | AC_SUBST(LIBRARY) | 234 | AC_SUBST(LIBRARY) |
243 | AC_MSG_CHECKING(LIBRARY) | 235 | AC_MSG_CHECKING(LIBRARY) |