diff -rupN Python-3.3.0.orig/Lib/distutils/command/install.py Python-3.3.0/Lib/distutils/command/install.py --- Python-3.3.0.orig/Lib/distutils/command/install.py 2012-09-29 10:00:27.000000000 +0200 +++ Python-3.3.0/Lib/distutils/command/install.py 2012-11-05 20:11:05.642494628 +0100 @@ -44,15 +44,15 @@ else: 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$abiflags/$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 -rupN Python-3.3.0.orig/Lib/distutils/sysconfig.py Python-3.3.0/Lib/distutils/sysconfig.py --- Python-3.3.0.orig/Lib/distutils/sysconfig.py 2012-09-29 10:00:28.000000000 +0200 +++ Python-3.3.0/Lib/distutils/sysconfig.py 2012-11-05 20:13:29.113243533 +0100 @@ -140,7 +140,7 @@ def get_python_lib(plat_specific=0, stan if os.name == "posix": libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) + "lib64", "python" + get_python_version()) if standard_lib: return libpython else: diff -rupN Python-3.3.0.orig/Lib/site.py Python-3.3.0/Lib/site.py --- Python-3.3.0.orig/Lib/site.py 2012-09-29 10:00:31.000000000 +0200 +++ Python-3.3.0/Lib/site.py 2012-11-05 20:17:58.868894959 +0100 @@ -303,13 +303,13 @@ def getsitepackages(prefixes=None): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "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")) 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 -rupN Python-3.3.0.orig/Lib/sysconfig.py Python-3.3.0/Lib/sysconfig.py --- Python-3.3.0.orig/Lib/sysconfig.py 2012-09-29 10:00:31.000000000 +0200 +++ Python-3.3.0/Lib/sysconfig.py 2012-11-05 20:20:46.266439892 +0100 @@ -21,10 +21,10 @@ __all__ = [ _INSTALL_SCHEMES = { 'posix_prefix': { - 'stdlib': '{installed_base}/lib/python{py_version_short}', - 'platstdlib': '{platbase}/lib/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', + 'stdlib': '{installed_base}/lib64/python{py_version_short}', + 'platstdlib': '{platbase}/lib64/python{py_version_short}', + 'purelib': '{base}/lib64/python{py_version_short}/site-packages', + 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', 'include': '{installed_base}/include/python{py_version_short}{abiflags}', 'platinclude': @@ -33,10 +33,10 @@ _INSTALL_SCHEMES = { 'data': '{base}', }, 'posix_home': { - 'stdlib': '{installed_base}/lib/python', - 'platstdlib': '{base}/lib/python', - 'purelib': '{base}/lib/python', - 'platlib': '{base}/lib/python', + 'stdlib': '{installed_base}/lib64/python', + 'platstdlib': '{base}/lib64/python', + 'purelib': '{base}/lib64/python', + 'platlib': '{base}/lib64/python', 'include': '{installed_base}/include/python', 'platinclude': '{installed_base}/include/python', 'scripts': '{base}/bin', @@ -81,10 +81,10 @@ _INSTALL_SCHEMES = { 'data': '{userbase}', }, 'posix_user': { - 'stdlib': '{userbase}/lib/python{py_version_short}', - 'platstdlib': '{userbase}/lib/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', + 'stdlib': '{userbase}/lib64/python{py_version_short}', + 'platstdlib': '{userbase}/lib64/python{py_version_short}', + 'purelib': '{userbase}/lib64/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 -rupN Python-3.3.0.orig/Makefile.pre.in Python-3.3.0/Makefile.pre.in --- Python-3.3.0.orig/Makefile.pre.in 2012-09-29 10:00:41.000000000 +0200 +++ Python-3.3.0/Makefile.pre.in 2012-11-05 21:06:16.588567780 +0100 @@ -108,7 +108,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib +SCRIPTDIR= $(prefix)/lib64 ABIFLAGS= @ABIFLAGS@ # Detailed destination directories diff -rupN Python-3.3.0.orig/Modules/getpath.c Python-3.3.0/Modules/getpath.c --- Python-3.3.0.orig/Modules/getpath.c 2012-09-29 10:00:45.000000000 +0200 +++ Python-3.3.0/Modules/getpath.c 2012-11-05 21:17:40.199937554 +0100 @@ -122,8 +122,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 @@ -135,7 +135,7 @@ static wchar_t exec_prefix[MAXPATHLEN+1] static wchar_t progpath[MAXPATHLEN+1]; static wchar_t *module_search_path = NULL; static int module_search_path_malloced = 0; -static wchar_t *lib_python = L"lib/python" VERSION; +static wchar_t *lib_python = L"lib64/python" VERSION; static void reduce(wchar_t *dir) @@ -677,7 +677,7 @@ calculate_path(void) } else wcsncpy(zip_path, _prefix, MAXPATHLEN); - joinpath(zip_path, L"lib/python00.zip"); + joinpath(zip_path, L"lib64/python00.zip"); bufsz = wcslen(zip_path); /* Replace "00" with version */ zip_path[bufsz - 6] = VERSION[0]; zip_path[bufsz - 5] = VERSION[2]; @@ -687,7 +687,7 @@ calculate_path(void) fprintf(stderr, "Could not find platform dependent libraries \n"); wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); - joinpath(exec_prefix, L"lib/lib-dynload"); + joinpath(exec_prefix, L"lib64/lib-dynload"); } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ diff -rupN Python-3.3.0.orig/setup.py Python-3.3.0/setup.py --- Python-3.3.0.orig/setup.py 2012-09-29 10:00:50.000000000 +0200 +++ Python-3.3.0/setup.py 2012-11-05 21:28:16.129711456 +0100 @@ -459,7 +459,7 @@ class PyBuildExt(build_ext): # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: - 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') # only change this for cross builds for 3.3, issues on Mageia if cross_compiling: @@ -729,11 +729,11 @@ class PyBuildExt(build_ext): 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: @@ -770,8 +770,8 @@ class PyBuildExt(build_ext): 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