diff -aurN Python-3.3.2.orig/Lib/distutils/command/install.py Python-3.3.2/Lib/distutils/command/install.py
--- Python-3.3.2.orig/Lib/distutils/command/install.py 2013-08-02 10:07:05.378371271 +0200
+++ Python-3.3.2/Lib/distutils/command/install.py 2013-08-02 10:07:26.360212825 +0200
@@ -45,14 +45,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$abiflags/$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',
diff -aurN Python-3.3.2.orig/Lib/distutils/sysconfig.py Python-3.3.2/Lib/distutils/sysconfig.py
--- Python-3.3.2.orig/Lib/distutils/sysconfig.py 2013-08-02 10:07:05.376371191 +0200
+++ Python-3.3.2/Lib/distutils/sysconfig.py 2013-08-02 10:07:26.360212825 +0200
@@ -143,8 +143,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:
diff -aurN Python-3.3.2.orig/Lib/site.py Python-3.3.2/Lib/site.py
--- Python-3.3.2.orig/Lib/site.py 2013-08-02 10:07:05.372371031 +0200
+++ Python-3.3.2/Lib/site.py 2013-08-02 10:07:26.360212825 +0200
@@ -303,12 +303,16 @@
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
elif os.sep == '/':
+ sitepackages.append(os.path.join(prefix, "lib64",
+ "python" + sys.version[:3],
+ "site-packages"))
sitepackages.append(os.path.join(prefix, "lib",
"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, "lib64", "site-packages"))
sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
diff -aurN Python-3.3.2.orig/Lib/sysconfig.py Python-3.3.2/Lib/sysconfig.py
--- Python-3.3.2.orig/Lib/sysconfig.py 2013-08-02 10:07:05.378371271 +0200
+++ Python-3.3.2/Lib/sysconfig.py 2013-08-02 10:07:26.360212825 +0200
@@ -21,10 +21,10 @@
_INSTALL_SCHEMES = {
'posix_prefix': {
- 'stdlib': '{installed_base}/lib/python{py_version_short}',
- 'platstdlib': '{platbase}/lib/python{py_version_short}',
+ 'stdlib': '{installed_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':
'{installed_base}/include/python{py_version_short}{abiflags}',
'platinclude':
@@ -33,10 +33,10 @@
'data': '{base}',
},
'posix_home': {
- 'stdlib': '{installed_base}/lib/python',
- 'platstdlib': '{base}/lib/python',
+ 'stdlib': '{installed_base}/lib64/python',
+ 'platstdlib': '{base}/lib64/python',
'purelib': '{base}/lib/python',
- 'platlib': '{base}/lib/python',
+ 'platlib': '{base}/lib64/python',
'include': '{installed_base}/include/python',
'platinclude': '{installed_base}/include/python',
'scripts': '{base}/bin',
@@ -81,10 +81,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 -aurN Python-3.3.2.orig/Makefile.pre.in Python-3.3.2/Makefile.pre.in
--- Python-3.3.2.orig/Makefile.pre.in 2013-08-02 10:07:05.339369707 +0200
+++ Python-3.3.2/Makefile.pre.in 2013-08-02 10:21:36.792384672 +0200
@@ -1177,7 +1177,7 @@
# Install the library and miscellaneous stuff needed for extending/embedding
# This goes into $(exec_prefix)
-LIBPL= $(LIBDEST)/config-$(LDVERSION)
+LIBPL= $(BINLIBDEST)/config-$(LDVERSION)
# pkgconfig directory
LIBPC= $(LIBDIR)/pkgconfig
diff -aurN Python-3.3.2.orig/Modules/getpath.c Python-3.3.2/Modules/getpath.c
--- Python-3.3.2.orig/Modules/getpath.c 2013-08-02 10:07:05.363370670 +0200
+++ Python-3.3.2/Modules/getpath.c 2013-08-02 10:07:26.361212865 +0200
@@ -123,7 +123,7 @@
#ifndef PYTHONPATH
#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
#endif
#ifndef LANDMARK
@@ -136,6 +136,7 @@
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 *lib64_python = L"lib64/python" VERSION;
static void
reduce(wchar_t *dir)
@@ -391,7 +392,7 @@
wcsncpy(exec_prefix, delim+1, MAXPATHLEN);
else
wcsncpy(exec_prefix, home, MAXPATHLEN);
- joinpath(exec_prefix, lib_python);
+ joinpath(exec_prefix, lib64_python);
joinpath(exec_prefix, L"lib-dynload");
return 1;
}
@@ -432,7 +433,7 @@
copy_absolute(exec_prefix, argv0_path, MAXPATHLEN+1);
do {
n = wcslen(exec_prefix);
- joinpath(exec_prefix, lib_python);
+ joinpath(exec_prefix, lib64_python);
joinpath(exec_prefix, L"lib-dynload");
if (isdir(exec_prefix))
return 1;
@@ -442,7 +443,7 @@
/* Look at configure's EXEC_PREFIX */
wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
- joinpath(exec_prefix, lib_python);
+ joinpath(exec_prefix, lib64_python);
joinpath(exec_prefix, L"lib-dynload");
if (isdir(exec_prefix))
return 1;
@@ -687,7 +688,7 @@
fprintf(stderr,
"Could not find platform dependent libraries