Contents of /trunk/python/patches/python-3.5.1-lib64-2.patch
Parent Directory | Revision Log
Revision 2738 -
(show annotations)
(download)
Tue Dec 8 13:55:44 2015 UTC (8 years, 9 months ago) by niro
File size: 13126 byte(s)
Tue Dec 8 13:55:44 2015 UTC (8 years, 9 months ago) by niro
File size: 13126 byte(s)
-re-diffed for python-3.5.1
1 | diff -Naur Python-3.5.1/Lib/distutils/command/install.py Python-3.5.1-lib64/Lib/distutils/command/install.py |
2 | --- Python-3.5.1/Lib/distutils/command/install.py 2015-12-07 02:39:07.000000000 +0100 |
3 | +++ Python-3.5.1-lib64/Lib/distutils/command/install.py 2015-12-08 14:18:46.185420721 +0100 |
4 | @@ -29,15 +29,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.5.1/Lib/distutils/sysconfig.py Python-3.5.1-lib64/Lib/distutils/sysconfig.py |
25 | --- Python-3.5.1/Lib/distutils/sysconfig.py 2015-12-07 02:39:07.000000000 +0100 |
26 | +++ Python-3.5.1-lib64/Lib/distutils/sysconfig.py 2015-12-08 14:19:15.296100150 +0100 |
27 | @@ -133,7 +133,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.5.1/Lib/distutils/tests/test_install.py Python-3.5.1-lib64/Lib/distutils/tests/test_install.py |
37 | --- Python-3.5.1/Lib/distutils/tests/test_install.py 2015-12-07 02:39:07.000000000 +0100 |
38 | +++ Python-3.5.1-lib64/Lib/distutils/tests/test_install.py 2015-12-08 14:55:31.592987981 +0100 |
39 | @@ -55,7 +55,7 @@ |
40 | expected = os.path.normpath(expected) |
41 | self.assertEqual(got, expected) |
42 | |
43 | - libdir = os.path.join(destination, "lib", "python") |
44 | + libdir = os.path.join(destination, "lib64", "python") |
45 | check_path(cmd.install_lib, libdir) |
46 | check_path(cmd.install_platlib, libdir) |
47 | check_path(cmd.install_purelib, libdir) |
48 | diff -Naur Python-3.5.1/Lib/site.py Python-3.5.1-lib64/Lib/site.py |
49 | --- Python-3.5.1/Lib/site.py 2015-12-07 02:39:08.000000000 +0100 |
50 | +++ Python-3.5.1-lib64/Lib/site.py 2015-12-08 14:21:10.677825826 +0100 |
51 | @@ -303,12 +303,12 @@ |
52 | seen.add(prefix) |
53 | |
54 | if os.sep == '/': |
55 | - sitepackages.append(os.path.join(prefix, "lib", |
56 | + sitepackages.append(os.path.join(prefix, "lib64", |
57 | "python" + sys.version[:3], |
58 | "site-packages")) |
59 | else: |
60 | sitepackages.append(prefix) |
61 | - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) |
62 | + sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) |
63 | if sys.platform == "darwin": |
64 | # for framework builds *only* we add the standard Apple |
65 | # locations. |
66 | diff -Naur Python-3.5.1/Lib/sysconfig.py Python-3.5.1-lib64/Lib/sysconfig.py |
67 | --- Python-3.5.1/Lib/sysconfig.py 2015-12-07 02:39:08.000000000 +0100 |
68 | +++ Python-3.5.1-lib64/Lib/sysconfig.py 2015-12-08 14:22:14.138122720 +0100 |
69 | @@ -20,10 +20,10 @@ |
70 | |
71 | _INSTALL_SCHEMES = { |
72 | 'posix_prefix': { |
73 | - 'stdlib': '{installed_base}/lib/python{py_version_short}', |
74 | - 'platstdlib': '{platbase}/lib/python{py_version_short}', |
75 | - 'purelib': '{base}/lib/python{py_version_short}/site-packages', |
76 | - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', |
77 | + 'stdlib': '{installed_base}/lib64/python{py_version_short}', |
78 | + 'platstdlib': '{platbase}/lib64/python{py_version_short}', |
79 | + 'purelib': '{base}/lib64/python{py_version_short}/site-packages', |
80 | + 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', |
81 | 'include': |
82 | '{installed_base}/include/python{py_version_short}{abiflags}', |
83 | 'platinclude': |
84 | @@ -32,10 +32,10 @@ |
85 | 'data': '{base}', |
86 | }, |
87 | 'posix_home': { |
88 | - 'stdlib': '{installed_base}/lib/python', |
89 | - 'platstdlib': '{base}/lib/python', |
90 | - 'purelib': '{base}/lib/python', |
91 | - 'platlib': '{base}/lib/python', |
92 | + 'stdlib': '{installed_base}/lib64/python', |
93 | + 'platstdlib': '{base}/lib64/python', |
94 | + 'purelib': '{base}/lib64/python', |
95 | + 'platlib': '{base}/lib64/python', |
96 | 'include': '{installed_base}/include/python', |
97 | 'platinclude': '{installed_base}/include/python', |
98 | 'scripts': '{base}/bin', |
99 | @@ -61,10 +61,10 @@ |
100 | 'data': '{userbase}', |
101 | }, |
102 | 'posix_user': { |
103 | - 'stdlib': '{userbase}/lib/python{py_version_short}', |
104 | - 'platstdlib': '{userbase}/lib/python{py_version_short}', |
105 | - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', |
106 | - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', |
107 | + 'stdlib': '{userbase}/lib64/python{py_version_short}', |
108 | + 'platstdlib': '{userbase}/lib64/python{py_version_short}', |
109 | + 'purelib': '{userbase}/lib64/python{py_version_short}/site-packages', |
110 | + 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', |
111 | 'include': '{userbase}/include/python{py_version_short}', |
112 | 'scripts': '{userbase}/bin', |
113 | 'data': '{userbase}', |
114 | diff -Naur Python-3.5.1/Lib/test/test_site.py Python-3.5.1-lib64/Lib/test/test_site.py |
115 | --- Python-3.5.1/Lib/test/test_site.py 2015-12-07 02:39:09.000000000 +0100 |
116 | +++ Python-3.5.1-lib64/Lib/test/test_site.py 2015-12-08 14:51:19.462897188 +0100 |
117 | @@ -243,15 +243,15 @@ |
118 | self.assertEqual(dirs[1], wanted) |
119 | elif os.sep == '/': |
120 | # OS X non-framwework builds, Linux, FreeBSD, etc |
121 | - self.assertEqual(len(dirs), 1) |
122 | - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], |
123 | + self.assertEqual(len(dirs), 2) |
124 | + wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3], |
125 | 'site-packages') |
126 | self.assertEqual(dirs[0], wanted) |
127 | else: |
128 | # other platforms |
129 | self.assertEqual(len(dirs), 2) |
130 | self.assertEqual(dirs[0], 'xoxo') |
131 | - wanted = os.path.join('xoxo', 'lib', 'site-packages') |
132 | + wanted = os.path.join('xoxo', 'lib64', 'site-packages') |
133 | self.assertEqual(dirs[1], wanted) |
134 | |
135 | class PthFile(object): |
136 | diff -Naur Python-3.5.1/Makefile.pre.in Python-3.5.1-lib64/Makefile.pre.in |
137 | --- Python-3.5.1/Makefile.pre.in 2015-12-07 02:39:09.000000000 +0100 |
138 | +++ Python-3.5.1-lib64/Makefile.pre.in 2015-12-08 14:58:10.788156157 +0100 |
139 | @@ -125,7 +125,7 @@ |
140 | MANDIR= @mandir@ |
141 | INCLUDEDIR= @includedir@ |
142 | CONFINCLUDEDIR= $(exec_prefix)/include |
143 | -SCRIPTDIR= $(prefix)/lib |
144 | +SCRIPTDIR= $(prefix)/lib64 |
145 | ABIFLAGS= @ABIFLAGS@ |
146 | |
147 | # Detailed destination directories |
148 | @@ -1358,7 +1358,7 @@ |
149 | |
150 | # Install the library and miscellaneous stuff needed for extending/embedding |
151 | # This goes into $(exec_prefix) |
152 | -LIBPL= @LIBPL@ |
153 | +LIBPL= $(LIBDEST)/config-$(LDVERSION) |
154 | |
155 | # pkgconfig directory |
156 | LIBPC= $(LIBDIR)/pkgconfig |
157 | diff -Naur Python-3.5.1/Modules/getpath.c Python-3.5.1-lib64/Modules/getpath.c |
158 | --- Python-3.5.1/Modules/getpath.c 2015-12-07 02:39:10.000000000 +0100 |
159 | +++ Python-3.5.1-lib64/Modules/getpath.c 2015-12-08 14:27:36.365534922 +0100 |
160 | @@ -118,8 +118,8 @@ |
161 | #endif |
162 | |
163 | #ifndef PYTHONPATH |
164 | -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ |
165 | - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" |
166 | +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ |
167 | + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" |
168 | #endif |
169 | |
170 | #ifndef LANDMARK |
171 | @@ -511,7 +511,7 @@ |
172 | _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL); |
173 | _prefix = Py_DecodeLocale(PREFIX, NULL); |
174 | _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL); |
175 | - lib_python = Py_DecodeLocale("lib/python" VERSION, NULL); |
176 | + lib_python = Py_DecodeLocale("lib64/python" VERSION, NULL); |
177 | |
178 | if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { |
179 | Py_FatalError( |
180 | @@ -700,7 +700,7 @@ |
181 | } |
182 | else |
183 | wcsncpy(zip_path, _prefix, MAXPATHLEN); |
184 | - joinpath(zip_path, L"lib/python00.zip"); |
185 | + joinpath(zip_path, L"lib64/python00.zip"); |
186 | bufsz = wcslen(zip_path); /* Replace "00" with version */ |
187 | zip_path[bufsz - 6] = VERSION[0]; |
188 | zip_path[bufsz - 5] = VERSION[2]; |
189 | @@ -712,7 +712,7 @@ |
190 | fprintf(stderr, |
191 | "Could not find platform dependent libraries <exec_prefix>\n"); |
192 | wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); |
193 | - joinpath(exec_prefix, L"lib/lib-dynload"); |
194 | + joinpath(exec_prefix, L"lib64/lib-dynload"); |
195 | } |
196 | /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ |
197 | |
198 | diff -Naur Python-3.5.1/Modules/Setup.dist Python-3.5.1-lib64/Modules/Setup.dist |
199 | --- Python-3.5.1/Modules/Setup.dist 2015-12-07 02:39:10.000000000 +0100 |
200 | +++ Python-3.5.1-lib64/Modules/Setup.dist 2015-12-08 14:28:50.590705364 +0100 |
201 | @@ -207,7 +207,7 @@ |
202 | #SSL=/usr/local/ssl |
203 | #_ssl _ssl.c \ |
204 | # -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ |
205 | -# -L$(SSL)/lib -lssl -lcrypto |
206 | +# -L$(SSL)/lib64 -lssl -lcrypto |
207 | |
208 | # The crypt module is now disabled by default because it breaks builds |
209 | # on many systems (where -lcrypt is needed), e.g. Linux (I believe). |
210 | @@ -283,7 +283,7 @@ |
211 | # *** Uncomment and edit to reflect your Tcl/Tk versions: |
212 | # -ltk8.2 -ltcl8.2 \ |
213 | # *** Uncomment and edit to reflect where your X11 libraries are: |
214 | -# -L/usr/X11R6/lib \ |
215 | +# -L/usr/X11R6/lib64 \ |
216 | # *** Or uncomment this for Solaris: |
217 | # -L/usr/openwin/lib \ |
218 | # *** Uncomment these for TOGL extension only: |
219 | @@ -328,7 +328,7 @@ |
220 | # |
221 | # First, look at Setup.config; configure may have set this for you. |
222 | |
223 | -#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm |
224 | +#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib64 -lgdbm |
225 | |
226 | |
227 | # Helper module for various ascii-encoders |
228 | @@ -358,7 +358,7 @@ |
229 | # Andrew Kuchling's zlib module. |
230 | # This require zlib 1.1.3 (or later). |
231 | # See http://www.gzip.org/zlib/ |
232 | -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz |
233 | +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz |
234 | |
235 | # Interface to the Expat XML parser |
236 | # |
237 | diff -Naur Python-3.5.1/setup.py Python-3.5.1-lib64/setup.py |
238 | --- Python-3.5.1/setup.py 2015-12-07 02:39:11.000000000 +0100 |
239 | +++ Python-3.5.1-lib64/setup.py 2015-12-08 14:32:22.358334318 +0100 |
240 | @@ -469,7 +469,7 @@ |
241 | # directories (i.e. '.' and 'Include') must be first. See issue |
242 | # 10520. |
243 | if not cross_compiling: |
244 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
245 | + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') |
246 | add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
247 | # only change this for cross builds for 3.3, issues on Mageia |
248 | if cross_compiling: |
249 | @@ -527,7 +527,6 @@ |
250 | if not cross_compiling: |
251 | lib_dirs = self.compiler.library_dirs + [ |
252 | '/lib64', '/usr/lib64', |
253 | - '/lib', '/usr/lib', |
254 | ] |
255 | inc_dirs = self.compiler.include_dirs + ['/usr/include'] |
256 | else: |
257 | @@ -750,11 +749,11 @@ |
258 | elif curses_library: |
259 | readline_libs.append(curses_library) |
260 | elif self.compiler.find_library_file(lib_dirs + |
261 | - ['/usr/lib/termcap'], |
262 | + ['/usr/lib64/termcap'], |
263 | 'termcap'): |
264 | readline_libs.append('termcap') |
265 | exts.append( Extension('readline', ['readline.c'], |
266 | - library_dirs=['/usr/lib/termcap'], |
267 | + library_dirs=['/usr/lib64/termcap'], |
268 | extra_link_args=readline_extra_link_args, |
269 | libraries=readline_libs) ) |
270 | else: |
271 | @@ -791,8 +790,8 @@ |
272 | if krb5_h: |
273 | ssl_incs += krb5_h |
274 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, |
275 | - ['/usr/local/ssl/lib', |
276 | - '/usr/contrib/ssl/lib/' |
277 | + ['/usr/local/ssl/lib64', |
278 | + '/usr/contrib/ssl/lib64/' |
279 | ] ) |
280 | |
281 | if (ssl_incs is not None and |
282 | @@ -1777,7 +1776,7 @@ |
283 | added_lib_dirs.append('/usr/X11R6/lib') |
284 | elif os.path.exists('/usr/X11R5/include'): |
285 | include_dirs.append('/usr/X11R5/include') |
286 | - added_lib_dirs.append('/usr/X11R5/lib') |
287 | + added_lib_dirs.append('/usr/X11R5/lib64') |
288 | else: |
289 | # Assume default location for X11 |
290 | include_dirs.append('/usr/X11/include') |