diff -Naur Python-2.7.1/Lib/distutils/command/install.py Python-2.7.1-magellan/Lib/distutils/command/install.py --- Python-2.7.1/Lib/distutils/command/install.py 2010-05-05 21:09:31.000000000 +0200 +++ Python-2.7.1-magellan/Lib/distutils/command/install.py 2011-07-27 21:32:25.000000000 +0200 @@ -41,15 +41,15 @@ INSTALL_SCHEMES = { 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib/python$py_version_short/site-packages', + 'purelib': '$base/lib64/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', + 'purelib': '$base/lib64/python', + 'platlib': '$base/lib64/python', 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', diff -Naur Python-2.7.1/Lib/distutils/sysconfig.py Python-2.7.1-magellan/Lib/distutils/sysconfig.py --- Python-2.7.1/Lib/distutils/sysconfig.py 2010-11-06 15:16:30.000000000 +0100 +++ Python-2.7.1-magellan/Lib/distutils/sysconfig.py 2011-07-27 21:34:06.000000000 +0200 @@ -114,8 +114,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()) + "lib64", "python" + get_python_version()) if standard_lib: return libpython else: diff -Naur Python-2.7.1/Lib/site.py Python-2.7.1-magellan/Lib/site.py --- Python-2.7.1/Lib/site.py 2010-10-13 00:53:51.000000000 +0200 +++ Python-2.7.1-magellan/Lib/site.py 2011-07-27 21:39:35.000000000 +0200 @@ -288,15 +288,15 @@ seen.add(prefix) if sys.platform in ('os2emx', 'riscos'): - sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) + sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) elif os.sep == '/': - sitepackages.append(os.path.join(prefix, "lib", + sitepackages.append(os.path.join(prefix, "lib64", "python" + sys.version[:3], "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) + sitepackages.append(os.path.join(prefix, "lib64", "site-python")) else: sitepackages.append(prefix) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) + sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. diff -Naur Python-2.7.1/Lib/sysconfig.py Python-2.7.1-magellan/Lib/sysconfig.py --- Python-2.7.1/Lib/sysconfig.py 2010-11-06 05:06:18.000000000 +0100 +++ Python-2.7.1-magellan/Lib/sysconfig.py 2011-07-27 21:31:01.000000000 +0200 @@ -7,20 +7,20 @@ _INSTALL_SCHEMES = { 'posix_prefix': { - 'stdlib': '{base}/lib/python{py_version_short}', - 'platstdlib': '{platbase}/lib/python{py_version_short}', + 'stdlib': '{base}/lib64/python{py_version_short}', + 'platstdlib': '{platbase}/lib64/python{py_version_short}', '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', 'include': '{base}/include/python{py_version_short}', 'platinclude': '{platbase}/include/python{py_version_short}', 'scripts': '{base}/bin', 'data': '{base}', }, 'posix_home': { - 'stdlib': '{base}/lib/python', - 'platstdlib': '{base}/lib/python', + 'stdlib': '{base}/lib64/python', + 'platstdlib': '{base}/lib64/python', 'purelib': '{base}/lib/python', - 'platlib': '{base}/lib/python', + 'platlib': '{base}/lib64/python', 'include': '{base}/include/python', 'platinclude': '{base}/include/python', 'scripts': '{base}/bin', @@ -65,10 +65,10 @@ 'data' : '{userbase}', }, 'posix_user': { - 'stdlib': '{userbase}/lib/python{py_version_short}', - 'platstdlib': '{userbase}/lib/python{py_version_short}', + 'stdlib': '{userbase}/lib64/python{py_version_short}', + 'platstdlib': '{userbase}/lib64/python{py_version_short}', 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', + 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data' : '{userbase}', diff -Naur Python-2.7.1/Makefile.pre.in Python-2.7.1-magellan/Makefile.pre.in --- Python-2.7.1/Makefile.pre.in 2010-10-14 13:37:30.000000000 +0200 +++ Python-2.7.1-magellan/Makefile.pre.in 2011-07-27 21:31:01.000000000 +0200 @@ -94,7 +94,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib +SCRIPTDIR= $(prefix)/lib64 # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) diff -Naur Python-2.7.1/Modules/getpath.c Python-2.7.1-magellan/Modules/getpath.c --- Python-2.7.1/Modules/getpath.c 2010-10-08 01:37:08.000000000 +0200 +++ Python-2.7.1-magellan/Modules/getpath.c 2011-07-27 21:31:01.000000000 +0200 @@ -117,8 +117,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 @@ -129,7 +129,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) @@ -528,7 +528,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]; @@ -538,7 +538,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.) */ diff -Naur Python-2.7.1/Modules/Setup.dist Python-2.7.1-magellan/Modules/Setup.dist --- Python-2.7.1/Modules/Setup.dist 2010-08-21 13:40:30.000000000 +0200 +++ Python-2.7.1-magellan/Modules/Setup.dist 2011-07-27 21:42:57.000000000 +0200 @@ -343,7 +343,7 @@ # *** Uncomment and edit to reflect your Tcl/Tk versions: # -ltk8.2 -ltcl8.2 \ # *** 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: @@ -414,7 +414,7 @@ #DB=/usr/local/BerkeleyDB.4.0 #DBLIBVER=4.0 #DBINC=$(DB)/include -#DBLIB=$(DB)/lib +#DBLIB=$(DB)/lib64 #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) # Historical Berkeley DB 1.85 @@ -460,7 +460,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 # diff -Naur Python-2.7.1/setup.py Python-2.7.1-magellan/setup.py --- Python-2.7.1/setup.py 2010-10-31 17:40:21.000000000 +0100 +++ Python-2.7.1-magellan/setup.py 2011-07-27 21:49:25.000000000 +0200 @@ -347,7 +347,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 specified in the environment variables LDFLAGS and @@ -654,11 +654,11 @@ elif curses_library: readline_libs.append(curses_library) 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'], extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: @@ -692,8 +692,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 @@ -1731,17 +1731,19 @@ if platform == 'sunos5': include_dirs.append('/usr/openwin/include') added_lib_dirs.append('/usr/openwin/lib') + elif os.path.exists('/usr/X11R7/include'): + include_dirs.append('/usr/X11R7/include') + added_lib_dirs.append('/usr/X11R7/lib64') elif os.path.exists('/usr/X11R6/include'): include_dirs.append('/usr/X11R6/include') added_lib_dirs.append('/usr/X11R6/lib64') - added_lib_dirs.append('/usr/X11R6/lib') elif os.path.exists('/usr/X11R5/include'): include_dirs.append('/usr/X11R5/include') - added_lib_dirs.append('/usr/X11R5/lib') + added_lib_dirs.append('/usr/X11R5/lib64') else: # Assume default location for X11 include_dirs.append('/usr/X11/include') - added_lib_dirs.append('/usr/X11/lib') + added_lib_dirs.append('/usr/X11/lib64') # If Cygwin, then verify that X is installed before proceeding if platform == 'cygwin':