--- Python-2.4b1/setup.py.lib64 2004-10-13 11:54:16.000000000 -0400 +++ Python-2.4b1/setup.py 2004-11-04 14:40:36.157840494 -0500 @@ -239,7 +239,7 @@ def detect_modules(self): # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # Add paths to popular package managers on OS X/darwin @@ -426,11 +426,11 @@ elif self.compiler.find_library_file(lib_dirs, 'curses'): readline_libs.append('curses') elif self.compiler.find_library_file(lib_dirs + - ['/usr/lib/termcap'], + ['/usr/lib64/termcap'], 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], + library_dirs=['/usr/lib64/termcap'], libraries=readline_libs) ) if platform not in ['mac']: # crypt module. @@ -459,8 +459,8 @@ if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, - ['/usr/local/ssl/lib', - '/usr/contrib/ssl/lib/' + ['/usr/local/ssl/lib64', + '/usr/contrib/ssl/lib64/' ] ) if (ssl_incs is not None and --- Python-2.4b1/Makefile.pre.in.lib64 2004-09-26 13:26:55.000000000 -0400 +++ Python-2.4b1/Makefile.pre.in 2004-11-04 14:35:15.932219533 -0500 @@ -79,11 +79,11 @@ # Expanded directories BINDIR= $(exec_prefix)/bin -LIBDIR= $(exec_prefix)/lib +LIBDIR= $(exec_prefix)/lib64 MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib +SCRIPTDIR= $(prefix)/lib64 # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) --- Python-2.4b1/Lib/distutils/sysconfig.py.lib64 2004-10-13 11:54:16.000000000 -0400 +++ Python-2.4b1/Lib/distutils/sysconfig.py 2004-11-04 14:35:15.886227488 -0500 @@ -99,8 +99,12 @@ prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": + if plat_specific or standard_lib: + lib = "lib64" + else: + lib = "lib" libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) + lib, "python" + get_python_version()) if standard_lib: return libpython else: --- Python-2.4b1/Lib/distutils/command/install.py.lib64 2004-10-13 08:35:28.000000000 -0400 +++ Python-2.4b1/Lib/distutils/command/install.py 2004-11-04 14:35:15.886227488 -0500 @@ -39,14 +39,14 @@ INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib/python$py_version_short/site-packages', + 'platlib': '$platbase/lib64/python$py_version_short/site-packages', 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', }, 'unix_home': { 'purelib': '$base/lib/python', - 'platlib': '$base/lib/python', + 'platlib': '$base/lib64/python', 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', --- Python-2.4b1/Modules/getpath.c.lib64 2004-08-07 21:00:47.000000000 -0400 +++ Python-2.4b1/Modules/getpath.c 2004-11-04 14:35:15.889226969 -0500 @@ -112,8 +112,8 @@ #endif #ifndef PYTHONPATH -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ - EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \ + EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload" #endif #ifndef LANDMARK @@ -124,7 +124,7 @@ static char exec_prefix[MAXPATHLEN+1]; static char progpath[MAXPATHLEN+1]; static char *module_search_path = NULL; -static char lib_python[] = "lib/python" VERSION; +static char lib_python[] = "lib64/python" VERSION; static void reduce(char *dir) @@ -515,7 +515,7 @@ } else strncpy(zip_path, PREFIX, MAXPATHLEN); - joinpath(zip_path, "lib/python00.zip"); + joinpath(zip_path, "lib64/python00.zip"); bufsz = strlen(zip_path); /* Replace "00" with version */ zip_path[bufsz - 6] = VERSION[0]; zip_path[bufsz - 5] = VERSION[2]; @@ -525,7 +525,7 @@ fprintf(stderr, "Could not find platform dependent libraries \n"); strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); - joinpath(exec_prefix, "lib/lib-dynload"); + joinpath(exec_prefix, "lib64/lib-dynload"); } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ --- Python-2.4b2/Lib/site.py.lib64 2004-07-19 22:28:28.000000000 -0400 +++ Python-2.4b2/Lib/site.py 2004-11-08 20:49:09.444166632 -0500 @@ -179,9 +179,14 @@ sitedirs = [os.path.join(prefix, "Lib", "site-packages")] elif os.sep == '/': sitedirs = [os.path.join(prefix, - "lib", + "lib64", "python" + sys.version[:3], "site-packages"), + os.path.join(prefix, + "lib", + "python" + sys.version[:3], + "site-packages"), + os.path.join(prefix, "lib64", "site-python"), os.path.join(prefix, "lib", "site-python")] else: sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] --- Python-2.4b1/Modules/Setup.dist.lib64 2004-11-04 14:35:15.805241496 -0500 +++ Python-2.4b1/Modules/Setup.dist 2004-11-04 14:38:43.884254818 -0500 @@ -325,7 +325,7 @@ # *** Uncomment and edit to reflect your Tcl/Tk versions: -ltk -ltcl \ # *** Uncomment and edit to reflect where your X11 libraries are: - -L/usr/X11R6/lib \ + -L/usr/X11R6/lib64 \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ # *** Uncomment these for TOGL extension only: @@ -395,7 +395,7 @@ # and the subdirectory of PORT where you built it. DBLIBVER=4.2 DBINC=/usr/include/db4 -DBLIB=/usr/lib +DBLIB=/usr/lib64 _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) # Historical Berkeley DB 1.85 @@ -441,7 +441,7 @@ # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). # See http://www.gzip.org/zlib/ -zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz # Interface to the Expat XML parser #