[617118d] | 1 | diff -uNr Python-2.4-orig/Lib/distutils/command/install.py Python-2.4/Lib/distutils/command/install.py |
---|
| 2 | --- Python-2.4-orig/Lib/distutils/command/install.py 2004-11-11 09:23:15.000000000 +1100 |
---|
| 3 | +++ Python-2.4/Lib/distutils/command/install.py 2005-02-05 22:27:58.261865984 +1100 |
---|
| 4 | @@ -39,14 +39,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 -uNr Python-2.4-orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/sysconfig.py |
---|
| 22 | --- Python-2.4-orig/Lib/distutils/sysconfig.py 2004-10-14 01:54:16.000000000 +1000 |
---|
| 23 | +++ Python-2.4/Lib/distutils/sysconfig.py 2005-02-05 22:27:58.262865832 +1100 |
---|
| 24 | @@ -99,8 +99,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 | + "lib64", "python" + get_python_version()) |
---|
| 35 | if standard_lib: |
---|
| 36 | return libpython |
---|
| 37 | else: |
---|
| 38 | diff -uNr Python-2.4-orig/Lib/site.py Python-2.4/Lib/site.py |
---|
| 39 | --- Python-2.4-orig/Lib/site.py 2004-07-20 12:28:28.000000000 +1000 |
---|
| 40 | +++ Python-2.4/Lib/site.py 2005-02-05 22:27:58.262865832 +1100 |
---|
| 41 | @@ -179,9 +179,14 @@ |
---|
| 42 | sitedirs = [os.path.join(prefix, "Lib", "site-packages")] |
---|
| 43 | elif os.sep == '/': |
---|
| 44 | sitedirs = [os.path.join(prefix, |
---|
| 45 | + "lib64", |
---|
| 46 | + "python" + sys.version[:3], |
---|
| 47 | + "site-packages"), |
---|
| 48 | + os.path.join(prefix, |
---|
| 49 | "lib", |
---|
| 50 | "python" + sys.version[:3], |
---|
| 51 | "site-packages"), |
---|
| 52 | + os.path.join(prefix, "lib64", "site-python"), |
---|
| 53 | os.path.join(prefix, "lib", "site-python")] |
---|
| 54 | else: |
---|
| 55 | sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] |
---|
| 56 | diff -uNr Python-2.4-orig/Makefile.pre.in Python-2.4/Makefile.pre.in |
---|
| 57 | --- Python-2.4-orig/Makefile.pre.in 2004-09-27 03:26:55.000000000 +1000 |
---|
| 58 | +++ Python-2.4/Makefile.pre.in 2005-02-05 22:27:58.263865680 +1100 |
---|
| 59 | @@ -79,11 +79,11 @@ |
---|
| 60 | |
---|
| 61 | # Expanded directories |
---|
| 62 | BINDIR= $(exec_prefix)/bin |
---|
| 63 | -LIBDIR= $(exec_prefix)/lib |
---|
| 64 | +LIBDIR= $(exec_prefix)/lib64 |
---|
| 65 | MANDIR= @mandir@ |
---|
| 66 | INCLUDEDIR= @includedir@ |
---|
| 67 | CONFINCLUDEDIR= $(exec_prefix)/include |
---|
| 68 | -SCRIPTDIR= $(prefix)/lib |
---|
| 69 | +SCRIPTDIR= $(prefix)/lib64 |
---|
| 70 | |
---|
| 71 | # Detailed destination directories |
---|
| 72 | BINLIBDEST= $(LIBDIR)/python$(VERSION) |
---|
| 73 | diff -uNr Python-2.4-orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist |
---|
| 74 | --- Python-2.4-orig/Modules/Setup.dist 2004-08-31 23:50:12.000000000 +1000 |
---|
| 75 | +++ Python-2.4/Modules/Setup.dist 2005-02-05 22:27:58.264865528 +1100 |
---|
| 76 | @@ -325,7 +325,7 @@ |
---|
| 77 | # *** Uncomment and edit to reflect your Tcl/Tk versions: |
---|
| 78 | # -ltk8.2 -ltcl8.2 \ |
---|
| 79 | # *** Uncomment and edit to reflect where your X11 libraries are: |
---|
| 80 | -# -L/usr/X11R6/lib \ |
---|
| 81 | + -L/usr/X11R6/lib64 \ |
---|
| 82 | # *** Or uncomment this for Solaris: |
---|
| 83 | # -L/usr/openwin/lib \ |
---|
| 84 | # *** Uncomment these for TOGL extension only: |
---|
| 85 | @@ -396,7 +396,7 @@ |
---|
| 86 | #DB=/usr/local/BerkeleyDB.4.0 |
---|
| 87 | #DBLIBVER=4.0 |
---|
| 88 | #DBINC=$(DB)/include |
---|
| 89 | -#DBLIB=$(DB)/lib |
---|
| 90 | +DBLIB=$(DB)/lib64 |
---|
| 91 | #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) |
---|
| 92 | |
---|
| 93 | # Historical Berkeley DB 1.85 |
---|
| 94 | @@ -442,7 +442,7 @@ |
---|
| 95 | # Andrew Kuchling's zlib module. |
---|
| 96 | # This require zlib 1.1.3 (or later). |
---|
| 97 | # See http://www.gzip.org/zlib/ |
---|
| 98 | -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz |
---|
| 99 | +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz |
---|
| 100 | |
---|
| 101 | # Interface to the Expat XML parser |
---|
| 102 | # |
---|
| 103 | diff -uNr Python-2.4-orig/Modules/getpath.c Python-2.4/Modules/getpath.c |
---|
| 104 | --- Python-2.4-orig/Modules/getpath.c 2004-08-08 11:00:47.000000000 +1000 |
---|
| 105 | +++ Python-2.4/Modules/getpath.c 2005-02-05 22:27:58.266865224 +1100 |
---|
| 106 | @@ -112,8 +112,8 @@ |
---|
| 107 | #endif |
---|
| 108 | |
---|
| 109 | #ifndef PYTHONPATH |
---|
| 110 | -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ |
---|
| 111 | - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" |
---|
| 112 | +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ |
---|
| 113 | + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" |
---|
| 114 | #endif |
---|
| 115 | |
---|
| 116 | #ifndef LANDMARK |
---|
| 117 | @@ -124,7 +124,7 @@ |
---|
| 118 | static char exec_prefix[MAXPATHLEN+1]; |
---|
| 119 | static char progpath[MAXPATHLEN+1]; |
---|
| 120 | static char *module_search_path = NULL; |
---|
| 121 | -static char lib_python[] = "lib/python" VERSION; |
---|
| 122 | +static char lib_python[] = "lib64/python" VERSION; |
---|
| 123 | |
---|
| 124 | static void |
---|
| 125 | reduce(char *dir) |
---|
| 126 | @@ -515,7 +515,7 @@ |
---|
| 127 | } |
---|
| 128 | else |
---|
| 129 | strncpy(zip_path, PREFIX, MAXPATHLEN); |
---|
| 130 | - joinpath(zip_path, "lib/python00.zip"); |
---|
| 131 | + joinpath(zip_path, "lib64/python00.zip"); |
---|
| 132 | bufsz = strlen(zip_path); /* Replace "00" with version */ |
---|
| 133 | zip_path[bufsz - 6] = VERSION[0]; |
---|
| 134 | zip_path[bufsz - 5] = VERSION[2]; |
---|
| 135 | @@ -525,7 +525,7 @@ |
---|
| 136 | fprintf(stderr, |
---|
| 137 | "Could not find platform dependent libraries <exec_prefix>\n"); |
---|
| 138 | strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); |
---|
| 139 | - joinpath(exec_prefix, "lib/lib-dynload"); |
---|
| 140 | + joinpath(exec_prefix, "lib64/lib-dynload"); |
---|
| 141 | } |
---|
| 142 | /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ |
---|
| 143 | |
---|
| 144 | diff -uNr Python-2.4-orig/setup.py Python-2.4/setup.py |
---|
| 145 | --- Python-2.4-orig/setup.py 2005-02-05 22:27:23.618132632 +1100 |
---|
| 146 | +++ Python-2.4/setup.py 2005-02-05 22:27:58.268864920 +1100 |
---|
| 147 | @@ -239,7 +239,7 @@ |
---|
| 148 | |
---|
| 149 | def detect_modules(self): |
---|
| 150 | # Ensure that /usr/local is always used |
---|
| 151 | - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
---|
| 152 | + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') |
---|
| 153 | add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
---|
| 154 | |
---|
| 155 | # Add paths to popular package managers on OS X/darwin |
---|
| 156 | @@ -429,11 +429,11 @@ |
---|
| 157 | elif self.compiler.find_library_file(lib_dirs, 'curses'): |
---|
| 158 | readline_libs.append('curses') |
---|
| 159 | elif self.compiler.find_library_file(lib_dirs + |
---|
| 160 | - ['/usr/lib/termcap'], |
---|
| 161 | + ['/usr/lib64/termcap'], |
---|
| 162 | 'termcap'): |
---|
| 163 | readline_libs.append('termcap') |
---|
| 164 | exts.append( Extension('readline', ['readline.c'], |
---|
| 165 | - library_dirs=['/usr/lib/termcap'], |
---|
| 166 | + library_dirs=['/usr/lib64/termcap'], |
---|
| 167 | libraries=readline_libs) ) |
---|
| 168 | if platform not in ['mac']: |
---|
| 169 | # crypt module. |
---|
| 170 | @@ -462,8 +462,8 @@ |
---|
| 171 | if krb5_h: |
---|
| 172 | ssl_incs += krb5_h |
---|
| 173 | ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, |
---|
| 174 | - ['/usr/local/ssl/lib', |
---|
| 175 | - '/usr/contrib/ssl/lib/' |
---|
| 176 | + ['/usr/local/ssl/lib64', |
---|
| 177 | + '/usr/contrib/ssl/lib64/' |
---|
| 178 | ] ) |
---|
| 179 | |
---|
| 180 | if (ssl_incs is not None and |
---|
| 181 | @@ -493,13 +493,13 @@ |
---|
| 182 | # order you wish to search - e.g., search for db4 before db3 |
---|
| 183 | db_try_this = { |
---|
| 184 | 'db4': {'libs': ('db-4.3', 'db43', 'db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',), |
---|
| 185 | - 'libdirs': ('/usr/local/BerkeleyDB.4.3/lib', |
---|
| 186 | - '/usr/local/BerkeleyDB.4.2/lib', |
---|
| 187 | - '/usr/local/BerkeleyDB.4.1/lib', |
---|
| 188 | - '/usr/local/BerkeleyDB.4.0/lib', |
---|
| 189 | - '/usr/local/lib', |
---|
| 190 | + 'libdirs': ('/usr/local/BerkeleyDB.4.3/lib64', |
---|
| 191 | + '/usr/local/BerkeleyDB.4.2/lib64', |
---|
| 192 | + '/usr/local/BerkeleyDB.4.1/lib64', |
---|
| 193 | + '/usr/local/BerkeleyDB.4.0/lib64', |
---|
| 194 | + '/usr/local/lib64', |
---|
| 195 | '/opt/sfw', |
---|
| 196 | - '/sw/lib', |
---|
| 197 | + '/sw/lib64', |
---|
| 198 | ), |
---|
| 199 | 'incdirs': ('/usr/local/BerkeleyDB.4.3/include', |
---|
| 200 | '/usr/local/include/db43', |
---|
| 201 | @@ -514,11 +514,11 @@ |
---|
| 202 | '/usr/include/db4', |
---|
| 203 | )}, |
---|
| 204 | 'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',), |
---|
| 205 | - 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib', |
---|
| 206 | - '/usr/local/BerkeleyDB.3.2/lib', |
---|
| 207 | - '/usr/local/lib', |
---|
| 208 | - '/opt/sfw/lib', |
---|
| 209 | - '/sw/lib', |
---|
| 210 | + 'libdirs': ('/usr/local/BerkeleyDB.3.3/lib64', |
---|
| 211 | + '/usr/local/BerkeleyDB.3.2/lib64', |
---|
| 212 | + '/usr/local/lib64', |
---|
| 213 | + '/opt/sfw/lib64', |
---|
| 214 | + '/sw/lib64', |
---|
| 215 | ), |
---|
| 216 | 'incdirs': ('/usr/local/BerkeleyDB.3.3/include', |
---|
| 217 | '/usr/local/BerkeleyDB.3.2/include', |
---|
| 218 | @@ -1000,11 +1000,11 @@ |
---|
| 219 | added_lib_dirs.append('/usr/X11R6/lib') |
---|
| 220 | elif os.path.exists('/usr/X11R5/include'): |
---|
| 221 | include_dirs.append('/usr/X11R5/include') |
---|
| 222 | - added_lib_dirs.append('/usr/X11R5/lib') |
---|
| 223 | + added_lib_dirs.append('/usr/X11R5/lib64') |
---|
| 224 | else: |
---|
| 225 | # Assume default location for X11 |
---|
| 226 | include_dirs.append('/usr/X11/include') |
---|
| 227 | - added_lib_dirs.append('/usr/X11/lib') |
---|
| 228 | + added_lib_dirs.append('/usr/X11/lib64') |
---|
| 229 | |
---|
| 230 | # If Cygwin, then verify that X is installed before proceeding |
---|
| 231 | if platform == 'cygwin': |
---|