Contents of /trunk/python/patches/python-2.6.0-lib64-2.patch
Parent Directory | Revision Log
Revision 705 -
(show annotations)
(download)
Wed Oct 15 17:47:35 2008 UTC (15 years, 11 months ago) by niro
File size: 7360 byte(s)
Wed Oct 15 17:47:35 2008 UTC (15 years, 11 months ago) by niro
File size: 7360 byte(s)
-fixed lib64 patch
1 | diff -Naur Python-2.6/Lib/distutils/command/install.py Python-2.6-magellan/Lib/distutils/command/install.py |
2 | --- Python-2.6/Lib/distutils/command/install.py 2008-05-07 00:41:46.000000000 +0200 |
3 | +++ Python-2.6-magellan/Lib/distutils/command/install.py 2008-10-15 19:54:31.000000000 +0200 |
4 | @@ -42,14 +42,14 @@ |
5 | INSTALL_SCHEMES = { |
6 | 'unix_prefix': { |
7 | 'purelib': '$base/lib/python$py_version_short/site-packages', |
8 | - 'platlib': '$platbase/lib/python$py_version_short/site-packages', |
9 | + 'platlib': '$platbase/lib64/python$py_version_short/site-packages', |
10 | 'headers': '$base/include/python$py_version_short/$dist_name', |
11 | 'scripts': '$base/bin', |
12 | 'data' : '$base', |
13 | }, |
14 | 'unix_home': { |
15 | 'purelib': '$base/lib/python', |
16 | - 'platlib': '$base/lib/python', |
17 | + 'platlib': '$base/lib64/python', |
18 | 'headers': '$base/include/python/$dist_name', |
19 | 'scripts': '$base/bin', |
20 | 'data' : '$base', |
21 | diff -Naur Python-2.6/Lib/distutils/sysconfig.py Python-2.6-magellan/Lib/distutils/sysconfig.py |
22 | --- Python-2.6/Lib/distutils/sysconfig.py 2008-06-05 14:58:24.000000000 +0200 |
23 | +++ Python-2.6-magellan/Lib/distutils/sysconfig.py 2008-10-15 19:54:31.000000000 +0200 |
24 | @@ -115,8 +115,12 @@ |
25 | prefix = plat_specific and EXEC_PREFIX or PREFIX |
26 | |
27 | if os.name == "posix": |
28 | + if plat_specific or standard_lib: |
29 | + lib = "lib64" |
30 | + else: |
31 | + lib = "lib" |
32 | libpython = os.path.join(prefix, |
33 | - "lib", "python" + get_python_version()) |
34 | + lib, "python" + get_python_version()) |
35 | if standard_lib: |
36 | return libpython |
37 | else: |
38 | diff -Naur Python-2.6/Lib/site.py Python-2.6-magellan/Lib/site.py |
39 | --- Python-2.6/Lib/site.py 2008-05-10 19:36:24.000000000 +0200 |
40 | +++ Python-2.6-magellan/Lib/site.py 2008-10-15 19:56:24.000000000 +0200 |
41 | @@ -265,9 +265,13 @@ |
42 | if sys.platform in ('os2emx', 'riscos'): |
43 | sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) |
44 | elif os.sep == '/': |
45 | + sitedirs.append(os.path.join(prefix, "lib64", |
46 | + "python" + sys.version[:3], |
47 | + "site-packages")) |
48 | sitedirs.append(os.path.join(prefix, "lib", |
49 | "python" + sys.version[:3], |
50 | "site-packages")) |
51 | + sitedirs.append(os.path.join(prefix, "lib64", "site-python")) |
52 | sitedirs.append(os.path.join(prefix, "lib", "site-python")) |
53 | else: |
54 | sitedirs.append(prefix) |
55 | diff -Naur Python-2.6/Makefile.pre.in Python-2.6-magellan/Makefile.pre.in |
56 | --- Python-2.6/Makefile.pre.in 2008-09-06 00:59:17.000000000 +0200 |
57 | +++ Python-2.6-magellan/Makefile.pre.in 2008-10-15 19:54:31.000000000 +0200 |
58 | @@ -87,11 +87,11 @@ |
59 | |
60 | # Expanded directories |
61 | BINDIR= $(exec_prefix)/bin |
62 | -LIBDIR= $(exec_prefix)/lib |
63 | +LIBDIR= $(exec_prefix)/lib64 |
64 | MANDIR= @mandir@ |
65 | INCLUDEDIR= @includedir@ |
66 | CONFINCLUDEDIR= $(exec_prefix)/include |
67 | -SCRIPTDIR= $(prefix)/lib |
68 | +SCRIPTDIR= $(prefix)/lib64 |
69 | |
70 | # Detailed destination directories |
71 | BINLIBDEST= $(LIBDIR)/python$(VERSION) |
72 | diff -Naur Python-2.6/Modules/getpath.c Python-2.6-magellan/Modules/getpath.c |
73 | --- Python-2.6/Modules/getpath.c 2007-03-10 08:38:14.000000000 +0100 |
74 | +++ Python-2.6-magellan/Modules/getpath.c 2008-10-15 19:54:31.000000000 +0200 |
75 | @@ -117,8 +117,8 @@ |
76 | #endif |
77 | |
78 | #ifndef PYTHONPATH |
79 | -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ |
80 | - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" |
81 | +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ |
82 | + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" |
83 | #endif |
84 | |
85 | #ifndef LANDMARK |
86 | @@ -129,7 +129,7 @@ |
87 | static char exec_prefix[MAXPATHLEN+1]; |
88 | static char progpath[MAXPATHLEN+1]; |
89 | static char *module_search_path = NULL; |
90 | -static char lib_python[] = "lib/python" VERSION; |
91 | +static char lib_python[] = "lib64/python" VERSION; |
92 | |
93 | static void |
94 | reduce(char *dir) |
95 | @@ -524,7 +524,7 @@ |
96 | } |
97 | else |
98 | strncpy(zip_path, PREFIX, MAXPATHLEN); |
99 | - joinpath(zip_path, "lib/python00.zip"); |
100 | + joinpath(zip_path, "lib64/python00.zip"); |
101 | bufsz = strlen(zip_path); /* Replace "00" with version */ |
102 | zip_path[bufsz - 6] = VERSION[0]; |
103 | zip_path[bufsz - 5] = VERSION[2]; |
104 | @@ -534,7 +534,7 @@ |
105 | fprintf(stderr, |
106 | "Could not find platform dependent libraries <exec_prefix>\n"); |
107 | strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); |
108 | - joinpath(exec_prefix, "lib/lib-dynload"); |
109 | + joinpath(exec_prefix, "lib64/lib-dynload"); |
110 | } |
111 | /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ |
112 | |
113 | diff -Naur Python-2.6/Modules/Setup.dist Python-2.6-magellan/Modules/Setup.dist |
114 | --- Python-2.6/Modules/Setup.dist 2008-09-21 09:31:52.000000000 +0200 |
115 | +++ Python-2.6-magellan/Modules/Setup.dist 2008-10-15 19:54:31.000000000 +0200 |
116 | @@ -409,7 +409,7 @@ |
117 | #DB=/usr/local/BerkeleyDB.4.0 |
118 | #DBLIBVER=4.0 |
119 | #DBINC=$(DB)/include |
120 | -#DBLIB=$(DB)/lib |
121 | +#DBLIB=$(DB)/lib64 |
122 | #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) |
123 | |
124 | # Historical Berkeley DB 1.85 |
125 | @@ -455,7 +455,7 @@ |
126 | # Andrew Kuchling's zlib module. |
127 | # This require zlib 1.1.3 (or later). |
128 | # See http://www.gzip.org/zlib/ |
129 | -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz |
130 | +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz |
131 | |
132 | # Interface to the Expat XML parser |
133 | # |
134 | diff -Naur Python-2.6/setup.py Python-2.6-magellan/setup.py |
135 | --- Python-2.6/setup.py 2008-09-30 02:15:45.000000000 +0200 |
136 | +++ Python-2.6-magellan/setup.py 2008-10-15 19:54:31.000000000 +0200 |
137 | @@ -310,7 +310,7 @@ |
138 | |
139 | def detect_modules(self): |
140 | # Ensure that /usr/local is always used |
141 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
142 | + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') |
143 | add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
144 | |
145 | # Add paths specified in the environment variables LDFLAGS and |
146 | @@ -583,11 +583,11 @@ |
147 | elif self.compiler.find_library_file(lib_dirs, 'curses'): |
148 | readline_libs.append('curses') |
149 | elif self.compiler.find_library_file(lib_dirs + |
150 | - ['/usr/lib/termcap'], |
151 | + ['/usr/lib64/termcap'], |
152 | 'termcap'): |
153 | readline_libs.append('termcap') |
154 | exts.append( Extension('readline', ['readline.c'], |
155 | - library_dirs=['/usr/lib/termcap'], |
156 | + library_dirs=['/usr/lib64/termcap'], |
157 | extra_link_args=readline_extra_link_args, |
158 | libraries=readline_libs) ) |
159 | else: |
160 | @@ -624,8 +624,8 @@ |
161 | if krb5_h: |
162 | ssl_incs += krb5_h |
163 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, |
164 | - ['/usr/local/ssl/lib', |
165 | - '/usr/contrib/ssl/lib/' |
166 | + ['/usr/local/ssl/lib64', |
167 | + '/usr/contrib/ssl/lib64/' |
168 | ] ) |
169 | |
170 | if (ssl_incs is not None and |