rpms/python27
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
main
python27/python-2.7.15-lib64.patch

163 lines
7.2 KiB
Diff
Raw Permalink Blame History

diff -ru Python-2.7.15/Lib/distutils/command/install.py Python-2.7.15.patched/Lib/distutils/command/install.py
--- Python-2.7.15/Lib/distutils/command/install.py 2018-04-30 00:47:33.000000000 +0200
+++ Python-2.7.15.patched/Lib/distutils/command/install.py 2018-09-06 15:10:51.535589859 +0200
@@ -42,14 +42,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',
diff -ru Python-2.7.15/Lib/distutils/sysconfig.py Python-2.7.15.patched/Lib/distutils/sysconfig.py
--- Python-2.7.15/Lib/distutils/sysconfig.py 2018-04-30 00:47:33.000000000 +0200
+++ Python-2.7.15.patched/Lib/distutils/sysconfig.py 2018-09-06 15:10:51.535589859 +0200
@@ -119,8 +119,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 -ru Python-2.7.15/Lib/site.py Python-2.7.15.patched/Lib/site.py
--- Python-2.7.15/Lib/site.py 2018-04-30 00:47:33.000000000 +0200
+++ Python-2.7.15.patched/Lib/site.py 2018-09-06 15:10:51.535589859 +0200
@@ -288,12 +288,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"))
return sitepackages
Only in Python-2.7.15.patched/Lib: site.py.orig
diff -ru Python-2.7.15/Makefile.pre.in Python-2.7.15.patched/Makefile.pre.in
--- Python-2.7.15/Makefile.pre.in 2018-04-30 00:47:33.000000000 +0200
+++ Python-2.7.15.patched/Makefile.pre.in 2018-09-06 15:10:51.536589863 +0200
@@ -110,7 +110,7 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
-SCRIPTDIR= $(prefix)/lib
+SCRIPTDIR= $(prefix)/lib64
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)
Only in Python-2.7.15.patched: Makefile.pre.in.orig
diff -ru Python-2.7.15/Modules/Setup.dist Python-2.7.15.patched/Modules/Setup.dist
--- Python-2.7.15/Modules/Setup.dist 2018-04-30 00:47:33.000000000 +0200
+++ Python-2.7.15.patched/Modules/Setup.dist 2018-09-06 15:10:51.536589863 +0200
@@ -418,7 +418,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
@@ -464,7 +464,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
#
Only in Python-2.7.15.patched/Modules: Setup.dist.orig
diff -ru Python-2.7.15/Modules/getpath.c Python-2.7.15.patched/Modules/getpath.c
--- Python-2.7.15/Modules/getpath.c 2018-04-30 00:47:33.000000000 +0200
+++ Python-2.7.15.patched/Modules/getpath.c 2018-09-06 15:10:51.536589863 +0200
@@ -108,7 +108,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)
@@ -520,7 +520,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];
@@ -530,7 +530,7 @@
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.) */
Only in Python-2.7.15.patched/Modules: getpath.c.orig
Only in Python-2.7.15.patched/Modules: getpath.c.rej
diff -ru Python-2.7.15/setup.py Python-2.7.15.patched/setup.py
--- Python-2.7.15/setup.py 2018-04-30 00:47:33.000000000 +0200
+++ Python-2.7.15.patched/setup.py 2018-09-06 15:10:51.536589863 +0200
@@ -457,6 +457,7 @@
# Ensure that /usr/local is always used
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')
if cross_compiling:
self.add_gcc_paths()
@@ -782,11 +783,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:
@@ -821,8 +822,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
Only in Python-2.7.15.patched: setup.py.orig
Reference in New Issue View Git Blame Copy Permalink