|
 |
60b7a5f |
--- Python-2.5b1/Lib/distutils/command/install.py.lib64 2006-03-27 16:55:21.000000000 -0500
|
|
|
60b7a5f |
+++ Python-2.5b1/Lib/distutils/command/install.py 2006-06-22 12:20:35.000000000 -0400
|
|
|
60b7a5f |
@@ -39,14 +39,14 @@
|
|
|
60b7a5f |
INSTALL_SCHEMES = {
|
|
|
60b7a5f |
'unix_prefix': {
|
|
|
60b7a5f |
'purelib': '$base/lib/python$py_version_short/site-packages',
|
|
|
60b7a5f |
- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
|
|
|
60b7a5f |
+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
|
|
|
60b7a5f |
'headers': '$base/include/python$py_version_short/$dist_name',
|
|
|
60b7a5f |
'scripts': '$base/bin',
|
|
|
60b7a5f |
'data' : '$base',
|
|
|
60b7a5f |
},
|
|
|
60b7a5f |
'unix_home': {
|
|
|
60b7a5f |
'purelib': '$base/lib/python',
|
|
|
60b7a5f |
- 'platlib': '$base/lib/python',
|
|
|
60b7a5f |
+ 'platlib': '$base/lib64/python',
|
|
|
60b7a5f |
'headers': '$base/include/python/$dist_name',
|
|
|
60b7a5f |
'scripts': '$base/bin',
|
|
|
60b7a5f |
'data' : '$base',
|
|
|
60b7a5f |
--- Python-2.5b1/Lib/distutils/sysconfig.py.lib64 2006-05-23 08:01:11.000000000 -0400
|
|
|
60b7a5f |
+++ Python-2.5b1/Lib/distutils/sysconfig.py 2006-06-22 12:20:35.000000000 -0400
|
|
|
60b7a5f |
@@ -99,8 +99,12 @@
|
|
|
60b7a5f |
prefix = plat_specific and EXEC_PREFIX or PREFIX
|
|
|
60b7a5f |
|
|
|
60b7a5f |
if os.name == "posix":
|
|
|
60b7a5f |
+ if plat_specific or standard_lib:
|
|
|
60b7a5f |
+ lib = "lib64"
|
|
|
60b7a5f |
+ else:
|
|
|
60b7a5f |
+ lib = "lib"
|
|
|
60b7a5f |
libpython = os.path.join(prefix,
|
|
|
60b7a5f |
- "lib", "python" + get_python_version())
|
|
|
60b7a5f |
+ lib, "python" + get_python_version())
|
|
|
60b7a5f |
if standard_lib:
|
|
|
60b7a5f |
return libpython
|
|
|
60b7a5f |
else:
|
|
|
60b7a5f |
--- Python-2.5b1/Lib/site.py.lib64 2006-06-12 04:23:02.000000000 -0400
|
|
|
60b7a5f |
+++ Python-2.5b1/Lib/site.py 2006-06-22 12:20:35.000000000 -0400
|
|
|
60b7a5f |
@@ -182,9 +182,14 @@
|
|
|
60b7a5f |
sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
|
|
|
60b7a5f |
elif os.sep == '/':
|
|
|
60b7a5f |
sitedirs = [os.path.join(prefix,
|
|
|
60b7a5f |
- "lib",
|
|
|
60b7a5f |
+ "lib64",
|
|
|
60b7a5f |
"python" + sys.version[:3],
|
|
|
60b7a5f |
"site-packages"),
|
|
|
60b7a5f |
+ os.path.join(prefix,
|
|
|
60b7a5f |
+ "lib",
|
|
|
60b7a5f |
+ "python" + sys.version[:3],
|
|
|
60b7a5f |
+ "site-packages"),
|
|
|
60b7a5f |
+ os.path.join(prefix, "lib64", "site-python"),
|
|
|
60b7a5f |
os.path.join(prefix, "lib", "site-python")]
|
|
|
60b7a5f |
else:
|
|
|
60b7a5f |
sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
|
|
|
60b7a5f |
--- Python-2.5b1/setup.py.lib64 2006-06-05 19:38:06.000000000 -0400
|
|
|
60b7a5f |
+++ Python-2.5b1/setup.py 2006-06-22 12:22:14.000000000 -0400
|
|
|
60b7a5f |
@@ -244,7 +244,7 @@
|
|
|
60b7a5f |
|
|
|
60b7a5f |
def detect_modules(self):
|
|
|
60b7a5f |
# Ensure that /usr/local is always used
|
|
|
60b7a5f |
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
|
60b7a5f |
+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
|
|
|
60b7a5f |
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
|
60b7a5f |
|
|
|
60b7a5f |
# Add paths specified in the environment variables LDFLAGS and
|
|
|
60b7a5f |
@@ -496,11 +496,11 @@
|
|
|
60b7a5f |
elif self.compiler.find_library_file(lib_dirs, 'curses'):
|
|
|
60b7a5f |
readline_libs.append('curses')
|
|
|
60b7a5f |
elif self.compiler.find_library_file(lib_dirs +
|
|
|
60b7a5f |
- ['/usr/lib/termcap'],
|
|
|
60b7a5f |
+ ['/usr/lib64/termcap'],
|
|
|
60b7a5f |
'termcap'):
|
|
|
60b7a5f |
readline_libs.append('termcap')
|
|
|
60b7a5f |
exts.append( Extension('readline', ['readline.c'],
|
|
|
60b7a5f |
- library_dirs=['/usr/lib/termcap'],
|
|
|
60b7a5f |
+ library_dirs=['/usr/lib64/termcap'],
|
|
|
60b7a5f |
extra_link_args=readline_extra_link_args,
|
|
|
60b7a5f |
libraries=readline_libs) )
|
|
|
60b7a5f |
if platform not in ['mac']:
|
|
|
60b7a5f |
@@ -532,8 +532,8 @@
|
|
|
60b7a5f |
if krb5_h:
|
|
|
60b7a5f |
ssl_incs += krb5_h
|
|
|
60b7a5f |
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
|
|
|
60b7a5f |
- ['/usr/local/ssl/lib',
|
|
|
60b7a5f |
- '/usr/contrib/ssl/lib/'
|
|
|
60b7a5f |
+ ['/usr/local/ssl/lib64',
|
|
|
60b7a5f |
+ '/usr/contrib/ssl/lib64/'
|
|
|
60b7a5f |
] )
|
|
|
60b7a5f |
|
|
|
60b7a5f |
if (ssl_incs is not None and
|
|
|
60b7a5f |
--- Python-2.5b1/Makefile.pre.in.lib64 2006-06-11 15:45:57.000000000 -0400
|
|
|
60b7a5f |
+++ Python-2.5b1/Makefile.pre.in 2006-06-22 12:20:34.000000000 -0400
|
|
|
60b7a5f |
@@ -84,11 +84,11 @@
|
|
|
60b7a5f |
|
|
|
60b7a5f |
# Expanded directories
|
|
|
60b7a5f |
BINDIR= $(exec_prefix)/bin
|
|
|
60b7a5f |
-LIBDIR= $(exec_prefix)/lib
|
|
|
60b7a5f |
+LIBDIR= $(exec_prefix)/lib64
|
|
|
60b7a5f |
MANDIR= @mandir@
|
|
|
60b7a5f |
INCLUDEDIR= @includedir@
|
|
|
60b7a5f |
CONFINCLUDEDIR= $(exec_prefix)/include
|
|
|
60b7a5f |
-SCRIPTDIR= $(prefix)/lib
|
|
|
60b7a5f |
+SCRIPTDIR= $(prefix)/lib64
|
|
|
60b7a5f |
|
|
|
60b7a5f |
# Detailed destination directories
|
|
|
60b7a5f |
BINLIBDEST= $(LIBDIR)/python$(VERSION)
|
|
|
60b7a5f |
--- Python-2.5b1/Modules/Setup.dist.lib64 2006-06-22 12:20:34.000000000 -0400
|
|
|
60b7a5f |
+++ Python-2.5b1/Modules/Setup.dist 2006-06-22 12:20:35.000000000 -0400
|
|
|
60b7a5f |
@@ -401,7 +401,7 @@
|
|
|
60b7a5f |
# and the subdirectory of PORT where you built it.
|
|
|
60b7a5f |
DBLIBVER=4.3
|
|
|
60b7a5f |
DBINC=/usr/include/db4
|
|
|
60b7a5f |
-DBLIB=/usr/lib
|
|
|
60b7a5f |
+DBLIB=/usr/lib64
|
|
|
60b7a5f |
_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
|
|
|
60b7a5f |
|
|
|
60b7a5f |
# Historical Berkeley DB 1.85
|
|
|
60b7a5f |
@@ -447,7 +447,7 @@
|
|
|
60b7a5f |
# Andrew Kuchling's zlib module.
|
|
|
60b7a5f |
# This require zlib 1.1.3 (or later).
|
|
|
60b7a5f |
# See http://www.gzip.org/zlib/
|
|
|
60b7a5f |
-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
|
|
|
60b7a5f |
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
|
|
|
60b7a5f |
|
|
|
60b7a5f |
# Interface to the Expat XML parser
|
|
|
60b7a5f |
#
|
|
|
60b7a5f |
--- Python-2.5b1/Modules/getpath.c.lib64 2006-04-12 22:06:09.000000000 -0400
|
|
|
60b7a5f |
+++ Python-2.5b1/Modules/getpath.c 2006-06-22 12:20:35.000000000 -0400
|
|
|
60b7a5f |
@@ -117,8 +117,8 @@
|
|
|
60b7a5f |
#endif
|
|
|
60b7a5f |
|
|
|
60b7a5f |
#ifndef PYTHONPATH
|
|
|
60b7a5f |
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
|
|
|
60b7a5f |
- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
|
|
|
60b7a5f |
+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
|
|
|
60b7a5f |
+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
|
|
|
60b7a5f |
#endif
|
|
|
60b7a5f |
|
|
|
60b7a5f |
#ifndef LANDMARK
|
|
|
60b7a5f |
@@ -129,7 +129,7 @@
|
|
|
60b7a5f |
static char exec_prefix[MAXPATHLEN+1];
|
|
|
60b7a5f |
static char progpath[MAXPATHLEN+1];
|
|
|
60b7a5f |
static char *module_search_path = NULL;
|
|
|
60b7a5f |
-static char lib_python[] = "lib/python" VERSION;
|
|
|
60b7a5f |
+static char lib_python[] = "lib64/python" VERSION;
|
|
|
60b7a5f |
|
|
|
60b7a5f |
static void
|
|
|
60b7a5f |
reduce(char *dir)
|
|
|
60b7a5f |
@@ -524,7 +524,7 @@
|
|
|
60b7a5f |
}
|
|
|
60b7a5f |
else
|
|
|
60b7a5f |
strncpy(zip_path, PREFIX, MAXPATHLEN);
|
|
|
60b7a5f |
- joinpath(zip_path, "lib/python00.zip");
|
|
|
60b7a5f |
+ joinpath(zip_path, "lib64/python00.zip");
|
|
|
60b7a5f |
bufsz = strlen(zip_path); /* Replace "00" with version */
|
|
|
60b7a5f |
zip_path[bufsz - 6] = VERSION[0];
|
|
|
60b7a5f |
zip_path[bufsz - 5] = VERSION[2];
|
|
|
60b7a5f |
@@ -534,7 +534,7 @@
|
|
|
60b7a5f |
fprintf(stderr,
|
|
|
60b7a5f |
"Could not find platform dependent libraries <exec_prefix>\n");
|
|
|
60b7a5f |
strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
|
|
|
60b7a5f |
- joinpath(exec_prefix, "lib/lib-dynload");
|
|
|
60b7a5f |
+ joinpath(exec_prefix, "lib64/lib-dynload");
|
|
|
60b7a5f |
}
|
|
|
60b7a5f |
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
|
|
|
60b7a5f |
|