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