2012-09-26 03:10:42 +02:00
|
|
|
diff -uar Python-2.7.2.orig/Lib/distutils/command/install.py Python-2.7.2/Lib/distutils/command/install.py
|
|
|
|
--- Python-2.7.2.orig/Lib/distutils/command/install.py 2011-06-11 18:46:24.000000000 +0300
|
|
|
|
+++ Python-2.7.2/Lib/distutils/command/install.py 2011-06-13 12:29:32.239106481 +0300
|
|
|
|
@@ -41,15 +41,15 @@
|
2009-08-26 17:00:38 +02:00
|
|
|
|
2012-09-26 03:10:42 +02:00
|
|
|
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 -uar Python-2.7.2.orig/Lib/distutils/sysconfig.py Python-2.7.2/Lib/distutils/sysconfig.py
|
|
|
|
--- Python-2.7.2.orig/Lib/distutils/sysconfig.py 2011-06-11 18:46:24.000000000 +0300
|
|
|
|
+++ Python-2.7.2/Lib/distutils/sysconfig.py 2011-06-13 12:29:32.239106481 +0300
|
|
|
|
@@ -115,7 +115,7 @@
|
|
|
|
|
|
|
|
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 -uar Python-2.7.2.orig/Lib/site.py Python-2.7.2/Lib/site.py
|
|
|
|
--- Python-2.7.2.orig/Lib/site.py 2011-06-11 18:46:25.000000000 +0300
|
|
|
|
+++ Python-2.7.2/Lib/site.py 2011-06-13 12:29:32.239106481 +0300
|
|
|
|
@@ -300,13 +300,13 @@
|
|
|
|
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 -uar Python-2.7.2.orig/Lib/sysconfig.py Python-2.7.2/Lib/sysconfig.py
|
|
|
|
--- Python-2.7.2.orig/Lib/sysconfig.py 2011-06-11 18:46:25.000000000 +0300
|
|
|
|
+++ Python-2.7.2/Lib/sysconfig.py 2011-06-13 12:29:32.240106474 +0300
|
|
|
|
@@ -7,20 +7,20 @@
|
|
|
|
|
|
|
|
_INSTALL_SCHEMES = {
|
|
|
|
'posix_prefix': {
|
|
|
|
- 'stdlib': '{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': '{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': '{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',
|
|
|
|
- 'purelib': '{base}/lib/python',
|
|
|
|
- 'platlib': '{base}/lib/python',
|
|
|
|
+ 'stdlib': '{base}/lib64/python',
|
|
|
|
+ 'platstdlib': '{base}/lib64/python',
|
|
|
|
+ 'purelib': '{base}/lib64/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}',
|
|
|
|
- '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 -uar Python-2.7.2.orig/Makefile.pre.in Python-2.7.2/Makefile.pre.in
|
|
|
|
--- Python-2.7.2.orig/Makefile.pre.in 2011-06-11 18:46:26.000000000 +0300
|
|
|
|
+++ Python-2.7.2/Makefile.pre.in 2011-06-13 12:29:32.240106474 +0300
|
|
|
|
@@ -97,7 +97,7 @@
|
2009-08-26 17:00:38 +02:00
|
|
|
MANDIR= @mandir@
|
|
|
|
INCLUDEDIR= @includedir@
|
|
|
|
CONFINCLUDEDIR= $(exec_prefix)/include
|
|
|
|
-SCRIPTDIR= $(prefix)/lib
|
|
|
|
+SCRIPTDIR= $(prefix)/lib64
|
|
|
|
|
|
|
|
# Detailed destination directories
|
|
|
|
BINLIBDEST= $(LIBDIR)/python$(VERSION)
|
2012-09-26 03:10:42 +02:00
|
|
|
diff -uar Python-2.7.2.orig/Modules/getpath.c Python-2.7.2/Modules/getpath.c
|
|
|
|
--- Python-2.7.2.orig/Modules/getpath.c 2011-06-11 18:46:27.000000000 +0300
|
|
|
|
+++ Python-2.7.2/Modules/getpath.c 2011-06-13 12:29:32.240106474 +0300
|
2009-08-26 17:00:38 +02:00
|
|
|
@@ -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)
|
2012-09-26 03:10:42 +02:00
|
|
|
@@ -528,7 +528,7 @@
|
2009-08-26 17:00:38 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
strncpy(zip_path, PREFIX, MAXPATHLEN);
|
|
|
|
- joinpath(zip_path, "lib/python00.zip");
|
|
|
|
+ joinpath(zip_path, "lib64/python00.zip");
|
2011-04-25 15:37:00 +02:00
|
|
|
bufsz = strlen(zip_path); /* Replace "00" with version */
|
2009-08-26 17:00:38 +02:00
|
|
|
zip_path[bufsz - 6] = VERSION[0];
|
|
|
|
zip_path[bufsz - 5] = VERSION[2];
|
2012-09-26 03:10:42 +02:00
|
|
|
@@ -538,7 +538,7 @@
|
2009-08-26 17:00:38 +02:00
|
|
|
fprintf(stderr,
|
|
|
|
"Could not find platform dependent libraries <exec_prefix>\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.) */
|
|
|
|
|
2012-09-26 03:10:42 +02:00
|
|
|
diff -uar Python-2.7.2.orig/setup.py Python-2.7.2/setup.py
|
|
|
|
--- Python-2.7.2.orig/setup.py 2011-06-11 18:46:28.000000000 +0300
|
|
|
|
+++ Python-2.7.2/setup.py 2011-06-13 12:29:32.241106466 +0300
|
|
|
|
@@ -369,7 +369,7 @@
|
2009-08-26 17:00:38 +02:00
|
|
|
|
|
|
|
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')
|
2012-09-26 03:10:42 +02:00
|
|
|
self.add_multiarch_paths()
|
2009-08-26 17:00:38 +02:00
|
|
|
|
2012-09-26 03:10:42 +02:00
|
|
|
@@ -677,11 +677,11 @@
|
2011-04-25 15:37:00 +02:00
|
|
|
elif curses_library:
|
|
|
|
readline_libs.append(curses_library)
|
2009-08-26 17:00:38 +02:00
|
|
|
elif self.compiler.find_library_file(lib_dirs +
|
2012-09-26 03:10:42 +02:00
|
|
|
- ['/usr/lib/termcap'],
|
|
|
|
+ ['/usr/lib64/termcap'],
|
|
|
|
'termcap'):
|
2009-08-26 17:00:38 +02:00
|
|
|
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:
|
2012-09-26 03:10:42 +02:00
|
|
|
@@ -715,8 +715,8 @@
|
2009-08-26 17:00:38 +02:00
|
|
|
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
|