Annotation of /trunk/python/patches/python-3.4.0-lib64.patch
Parent Directory | Revision Log
Revision 2441 -
(hide annotations)
(download)
Wed Jun 25 08:34:47 2014 UTC (10 years, 3 months ago) by niro
File size: 12656 byte(s)
Wed Jun 25 08:34:47 2014 UTC (10 years, 3 months ago) by niro
File size: 12656 byte(s)
-re-diffed against 3.4.0
1 | niro | 2441 | diff -Naur Python-3.4.0/Lib/distutils/command/install.py Python-3.4.0-lib64/Lib/distutils/command/install.py |
2 | --- Python-3.4.0/Lib/distutils/command/install.py 2014-03-17 02:31:29.000000000 +0000 | ||
3 | +++ Python-3.4.0-lib64/Lib/distutils/command/install.py 2014-06-25 10:52:51.394000000 +0000 | ||
4 | @@ -44,15 +44,15 @@ | ||
5 | |||
6 | INSTALL_SCHEMES = { | ||
7 | 'unix_prefix': { | ||
8 | - 'purelib': '$base/lib/python$py_version_short/site-packages', | ||
9 | - 'platlib': '$platbase/lib/python$py_version_short/site-packages', | ||
10 | + 'purelib': '$base/lib64/python$py_version_short/site-packages', | ||
11 | + 'platlib': '$platbase/lib64/python$py_version_short/site-packages', | ||
12 | 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', | ||
13 | 'scripts': '$base/bin', | ||
14 | 'data' : '$base', | ||
15 | }, | ||
16 | 'unix_home': { | ||
17 | - 'purelib': '$base/lib/python', | ||
18 | - 'platlib': '$base/lib/python', | ||
19 | + 'purelib': '$base/lib64/python', | ||
20 | + 'platlib': '$base/lib64/python', | ||
21 | 'headers': '$base/include/python/$dist_name', | ||
22 | 'scripts': '$base/bin', | ||
23 | 'data' : '$base', | ||
24 | diff -Naur Python-3.4.0/Lib/distutils/sysconfig.py Python-3.4.0-lib64/Lib/distutils/sysconfig.py | ||
25 | --- Python-3.4.0/Lib/distutils/sysconfig.py 2014-03-17 02:31:29.000000000 +0000 | ||
26 | +++ Python-3.4.0-lib64/Lib/distutils/sysconfig.py 2014-06-25 10:53:24.954000000 +0000 | ||
27 | @@ -142,7 +142,7 @@ | ||
28 | |||
29 | if os.name == "posix": | ||
30 | libpython = os.path.join(prefix, | ||
31 | - "lib", "python" + get_python_version()) | ||
32 | + "lib64", "python" + get_python_version()) | ||
33 | if standard_lib: | ||
34 | return libpython | ||
35 | else: | ||
36 | diff -Naur Python-3.4.0/Lib/site.py Python-3.4.0-lib64/Lib/site.py | ||
37 | --- Python-3.4.0/Lib/site.py 2014-03-17 02:31:30.000000000 +0000 | ||
38 | +++ Python-3.4.0-lib64/Lib/site.py 2014-06-25 10:54:12.627000000 +0000 | ||
39 | @@ -304,13 +304,13 @@ | ||
40 | seen.add(prefix) | ||
41 | |||
42 | if os.sep == '/': | ||
43 | - sitepackages.append(os.path.join(prefix, "lib", | ||
44 | + sitepackages.append(os.path.join(prefix, "lib64", | ||
45 | "python" + sys.version[:3], | ||
46 | "site-packages")) | ||
47 | - sitepackages.append(os.path.join(prefix, "lib", "site-python")) | ||
48 | + sitepackages.append(os.path.join(prefix, "lib64", "site-python")) | ||
49 | else: | ||
50 | sitepackages.append(prefix) | ||
51 | - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) | ||
52 | + sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) | ||
53 | if sys.platform == "darwin": | ||
54 | # for framework builds *only* we add the standard Apple | ||
55 | # locations. | ||
56 | diff -Naur Python-3.4.0/Lib/sysconfig.py Python-3.4.0-lib64/Lib/sysconfig.py | ||
57 | --- Python-3.4.0/Lib/sysconfig.py 2014-03-17 02:31:30.000000000 +0000 | ||
58 | +++ Python-3.4.0-lib64/Lib/sysconfig.py 2014-06-25 10:55:36.307000000 +0000 | ||
59 | @@ -20,10 +20,10 @@ | ||
60 | |||
61 | _INSTALL_SCHEMES = { | ||
62 | 'posix_prefix': { | ||
63 | - 'stdlib': '{installed_base}/lib/python{py_version_short}', | ||
64 | - 'platstdlib': '{platbase}/lib/python{py_version_short}', | ||
65 | - 'purelib': '{base}/lib/python{py_version_short}/site-packages', | ||
66 | - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', | ||
67 | + 'stdlib': '{installed_base}/lib64/python{py_version_short}', | ||
68 | + 'platstdlib': '{platbase}/lib64/python{py_version_short}', | ||
69 | + 'purelib': '{base}/lib64/python{py_version_short}/site-packages', | ||
70 | + 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', | ||
71 | 'include': | ||
72 | '{installed_base}/include/python{py_version_short}{abiflags}', | ||
73 | 'platinclude': | ||
74 | @@ -32,10 +32,10 @@ | ||
75 | 'data': '{base}', | ||
76 | }, | ||
77 | 'posix_home': { | ||
78 | - 'stdlib': '{installed_base}/lib/python', | ||
79 | - 'platstdlib': '{base}/lib/python', | ||
80 | - 'purelib': '{base}/lib/python', | ||
81 | - 'platlib': '{base}/lib/python', | ||
82 | + 'stdlib': '{installed_base}/lib64/python', | ||
83 | + 'platstdlib': '{base}/lib64/python', | ||
84 | + 'purelib': '{base}/lib64/python', | ||
85 | + 'platlib': '{base}/lib64/python', | ||
86 | 'include': '{installed_base}/include/python', | ||
87 | 'platinclude': '{installed_base}/include/python', | ||
88 | 'scripts': '{base}/bin', | ||
89 | @@ -61,10 +61,10 @@ | ||
90 | 'data': '{userbase}', | ||
91 | }, | ||
92 | 'posix_user': { | ||
93 | - 'stdlib': '{userbase}/lib/python{py_version_short}', | ||
94 | - 'platstdlib': '{userbase}/lib/python{py_version_short}', | ||
95 | - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', | ||
96 | - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', | ||
97 | + 'stdlib': '{userbase}/lib64/python{py_version_short}', | ||
98 | + 'platstdlib': '{userbase}/lib64/python{py_version_short}', | ||
99 | + 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', | ||
100 | + 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', | ||
101 | 'include': '{userbase}/include/python{py_version_short}', | ||
102 | 'scripts': '{userbase}/bin', | ||
103 | 'data': '{userbase}', | ||
104 | diff -Naur Python-3.4.0/Lib/test/test_site.py Python-3.4.0-lib64/Lib/test/test_site.py | ||
105 | --- Python-3.4.0/Lib/test/test_site.py 2014-03-17 02:31:30.000000000 +0000 | ||
106 | +++ Python-3.4.0-lib64/Lib/test/test_site.py 2014-06-25 10:57:01.715000000 +0000 | ||
107 | @@ -244,16 +244,16 @@ | ||
108 | elif os.sep == '/': | ||
109 | # OS X non-framwework builds, Linux, FreeBSD, etc | ||
110 | self.assertEqual(len(dirs), 2) | ||
111 | - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], | ||
112 | + wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], | ||
113 | 'site-packages') | ||
114 | self.assertEqual(dirs[0], wanted) | ||
115 | - wanted = os.path.join('xoxo', 'lib', 'site-python') | ||
116 | + wanted = os.path.join('xoxo', 'lib64', 'site-python') | ||
117 | self.assertEqual(dirs[1], wanted) | ||
118 | else: | ||
119 | # other platforms | ||
120 | self.assertEqual(len(dirs), 2) | ||
121 | self.assertEqual(dirs[0], 'xoxo') | ||
122 | - wanted = os.path.join('xoxo', 'lib', 'site-packages') | ||
123 | + wanted = os.path.join('xoxo', 'lib64', 'site-packages') | ||
124 | self.assertEqual(dirs[1], wanted) | ||
125 | |||
126 | class PthFile(object): | ||
127 | diff -Naur Python-3.4.0/Makefile.pre.in Python-3.4.0-lib64/Makefile.pre.in | ||
128 | --- Python-3.4.0/Makefile.pre.in 2014-03-17 02:31:30.000000000 +0000 | ||
129 | +++ Python-3.4.0-lib64/Makefile.pre.in 2014-06-25 10:57:21.268000000 +0000 | ||
130 | @@ -115,7 +115,7 @@ | ||
131 | MANDIR= @mandir@ | ||
132 | INCLUDEDIR= @includedir@ | ||
133 | CONFINCLUDEDIR= $(exec_prefix)/include | ||
134 | -SCRIPTDIR= $(prefix)/lib | ||
135 | +SCRIPTDIR= $(prefix)/lib64 | ||
136 | ABIFLAGS= @ABIFLAGS@ | ||
137 | |||
138 | # Detailed destination directories | ||
139 | diff -Naur Python-3.4.0/Modules/getpath.c Python-3.4.0-lib64/Modules/getpath.c | ||
140 | --- Python-3.4.0/Modules/getpath.c 2014-03-17 02:31:31.000000000 +0000 | ||
141 | +++ Python-3.4.0-lib64/Modules/getpath.c 2014-06-25 10:59:04.108000000 +0000 | ||
142 | @@ -118,8 +118,8 @@ | ||
143 | #endif | ||
144 | |||
145 | #ifndef PYTHONPATH | ||
146 | -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ | ||
147 | - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" | ||
148 | +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ | ||
149 | + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" | ||
150 | #endif | ||
151 | |||
152 | #ifndef LANDMARK | ||
153 | @@ -494,7 +494,7 @@ | ||
154 | _pythonpath = _Py_char2wchar(PYTHONPATH, NULL); | ||
155 | _prefix = _Py_char2wchar(PREFIX, NULL); | ||
156 | _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL); | ||
157 | - lib_python = _Py_char2wchar("lib/python" VERSION, NULL); | ||
158 | + lib_python = _Py_char2wchar("lib64/python" VERSION, NULL); | ||
159 | |||
160 | if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { | ||
161 | Py_FatalError( | ||
162 | @@ -683,7 +683,7 @@ | ||
163 | } | ||
164 | else | ||
165 | wcsncpy(zip_path, _prefix, MAXPATHLEN); | ||
166 | - joinpath(zip_path, L"lib/python00.zip"); | ||
167 | + joinpath(zip_path, L"lib64/python00.zip"); | ||
168 | bufsz = wcslen(zip_path); /* Replace "00" with version */ | ||
169 | zip_path[bufsz - 6] = VERSION[0]; | ||
170 | zip_path[bufsz - 5] = VERSION[2]; | ||
171 | @@ -695,7 +695,7 @@ | ||
172 | fprintf(stderr, | ||
173 | "Could not find platform dependent libraries <exec_prefix>\n"); | ||
174 | wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); | ||
175 | - joinpath(exec_prefix, L"lib/lib-dynload"); | ||
176 | + joinpath(exec_prefix, L"lib64/lib-dynload"); | ||
177 | } | ||
178 | /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ | ||
179 | |||
180 | diff -Naur Python-3.4.0/Modules/Setup.dist Python-3.4.0-lib64/Modules/Setup.dist | ||
181 | --- Python-3.4.0/Modules/Setup.dist 2014-03-17 02:31:30.000000000 +0000 | ||
182 | +++ Python-3.4.0-lib64/Modules/Setup.dist 2014-06-25 11:00:40.348000000 +0000 | ||
183 | @@ -207,7 +207,7 @@ | ||
184 | #SSL=/usr/local/ssl | ||
185 | #_ssl _ssl.c \ | ||
186 | # -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ | ||
187 | -# -L$(SSL)/lib -lssl -lcrypto | ||
188 | +# -L$(SSL)/lib64 -lssl -lcrypto | ||
189 | |||
190 | # The crypt module is now disabled by default because it breaks builds | ||
191 | # on many systems (where -lcrypt is needed), e.g. Linux (I believe). | ||
192 | @@ -283,7 +283,7 @@ | ||
193 | # *** Uncomment and edit to reflect your Tcl/Tk versions: | ||
194 | # -ltk8.2 -ltcl8.2 \ | ||
195 | # *** Uncomment and edit to reflect where your X11 libraries are: | ||
196 | -# -L/usr/X11R6/lib \ | ||
197 | +# -L/usr/X11R6/lib64 \ | ||
198 | # *** Or uncomment this for Solaris: | ||
199 | # -L/usr/openwin/lib \ | ||
200 | # *** Uncomment these for TOGL extension only: | ||
201 | @@ -328,7 +328,7 @@ | ||
202 | # | ||
203 | # First, look at Setup.config; configure may have set this for you. | ||
204 | |||
205 | -#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm | ||
206 | +#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib64 -lgdbm | ||
207 | |||
208 | |||
209 | # Helper module for various ascii-encoders | ||
210 | @@ -358,7 +358,7 @@ | ||
211 | # Andrew Kuchling's zlib module. | ||
212 | # This require zlib 1.1.3 (or later). | ||
213 | # See http://www.gzip.org/zlib/ | ||
214 | -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz | ||
215 | +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz | ||
216 | |||
217 | # Interface to the Expat XML parser | ||
218 | # | ||
219 | diff -Naur Python-3.4.0/setup.py Python-3.4.0-lib64/setup.py | ||
220 | --- Python-3.4.0/setup.py 2014-03-17 02:31:31.000000000 +0000 | ||
221 | +++ Python-3.4.0-lib64/setup.py 2014-06-25 11:04:01.718000000 +0000 | ||
222 | @@ -445,7 +445,7 @@ | ||
223 | # directories (i.e. '.' and 'Include') must be first. See issue | ||
224 | # 10520. | ||
225 | if not cross_compiling: | ||
226 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') | ||
227 | + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') | ||
228 | add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') | ||
229 | # only change this for cross builds for 3.3, issues on Mageia | ||
230 | if cross_compiling: | ||
231 | @@ -503,7 +503,6 @@ | ||
232 | if not cross_compiling: | ||
233 | lib_dirs = self.compiler.library_dirs + [ | ||
234 | '/lib64', '/usr/lib64', | ||
235 | - '/lib', '/usr/lib', | ||
236 | ] | ||
237 | inc_dirs = self.compiler.include_dirs + ['/usr/include'] | ||
238 | else: | ||
239 | @@ -722,11 +721,11 @@ | ||
240 | elif curses_library: | ||
241 | readline_libs.append(curses_library) | ||
242 | elif self.compiler.find_library_file(lib_dirs + | ||
243 | - ['/usr/lib/termcap'], | ||
244 | + ['/usr/lib64/termcap'], | ||
245 | 'termcap'): | ||
246 | readline_libs.append('termcap') | ||
247 | exts.append( Extension('readline', ['readline.c'], | ||
248 | - library_dirs=['/usr/lib/termcap'], | ||
249 | + library_dirs=['/usr/lib64/termcap'], | ||
250 | extra_link_args=readline_extra_link_args, | ||
251 | libraries=readline_libs) ) | ||
252 | else: | ||
253 | @@ -763,8 +762,8 @@ | ||
254 | if krb5_h: | ||
255 | ssl_incs += krb5_h | ||
256 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, | ||
257 | - ['/usr/local/ssl/lib', | ||
258 | - '/usr/contrib/ssl/lib/' | ||
259 | + ['/usr/local/ssl/lib64', | ||
260 | + '/usr/contrib/ssl/lib64/' | ||
261 | ] ) | ||
262 | |||
263 | if (ssl_incs is not None and | ||
264 | @@ -1739,11 +1738,11 @@ | ||
265 | added_lib_dirs.append('/usr/X11R6/lib') | ||
266 | elif os.path.exists('/usr/X11R5/include'): | ||
267 | include_dirs.append('/usr/X11R5/include') | ||
268 | - added_lib_dirs.append('/usr/X11R5/lib') | ||
269 | + added_lib_dirs.append('/usr/X11R5/lib64') | ||
270 | else: | ||
271 | # Assume default location for X11 | ||
272 | include_dirs.append('/usr/X11/include') | ||
273 | - added_lib_dirs.append('/usr/X11/lib') | ||
274 | + added_lib_dirs.append('/usr/X11/lib64') | ||
275 | |||
276 | # If Cygwin, then verify that X is installed before proceeding | ||
277 | if host_platform == 'cygwin': |