damien
/
slackbuilds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Some SlackBuild scripts for Slackware.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
3391 Commits
4 Branches
0 Tags
27 MiB
 
Tree: 1ec702b9b4
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '1ec702b9b4'
${ noResults }
slackbuilds/d/python3/Python-3.7.0-x86_64.diff

182 lines
8.2 KiB
Raw Blame History

diff -Naur Python-3.7.0.orig/Lib/distutils/command/install.py Python-3.7.0/Lib/distutils/command/install.py
--- Python-3.7.0.orig/Lib/distutils/command/install.py 2018-06-27 04:07:35.000000000 +0100
+++ Python-3.7.0/Lib/distutils/command/install.py 2018-10-20 10:59:43.162459378 +0100
@@ -29,15 +29,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$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 -Naur Python-3.7.0.orig/Lib/distutils/sysconfig.py Python-3.7.0/Lib/distutils/sysconfig.py
--- Python-3.7.0.orig/Lib/distutils/sysconfig.py 2018-06-27 04:07:35.000000000 +0100
+++ Python-3.7.0/Lib/distutils/sysconfig.py 2018-10-20 10:59:43.163459379 +0100
@@ -130,7 +130,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 -Naur Python-3.7.0.orig/Lib/site.py Python-3.7.0/Lib/site.py
--- Python-3.7.0.orig/Lib/site.py 2018-06-27 04:07:35.000000000 +0100
+++ Python-3.7.0/Lib/site.py 2018-10-20 11:00:30.391500459 +0100
@@ -271,7 +271,7 @@
if sys.platform == 'darwin' and sys._framework:
return f'{userbase}/lib/python/site-packages'
- return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
+ return f'{userbase}/lib64/python{version[0]}.{version[1]}/site-packages'
def getuserbase():
@@ -334,7 +334,7 @@
seen.add(prefix)
if os.sep == '/':
- sitepackages.append(os.path.join(prefix, "lib",
+ sitepackages.append(os.path.join(prefix, "lib64",
"python%d.%d" % sys.version_info[:2],
"site-packages"))
else:
diff -Naur Python-3.7.0.orig/Lib/sysconfig.py Python-3.7.0/Lib/sysconfig.py
--- Python-3.7.0.orig/Lib/sysconfig.py 2018-06-27 04:07:35.000000000 +0100
+++ Python-3.7.0/Lib/sysconfig.py 2018-10-20 10:59:43.165459381 +0100
@@ -20,10 +20,10 @@
_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':
@@ -32,10 +32,10 @@
'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',
@@ -62,10 +62,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 -Naur Python-3.7.0.orig/Makefile.pre.in Python-3.7.0/Makefile.pre.in
--- Python-3.7.0.orig/Makefile.pre.in 2018-06-27 04:07:35.000000000 +0100
+++ Python-3.7.0/Makefile.pre.in 2018-10-20 10:59:43.167459382 +0100
@@ -134,7 +134,7 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
-SCRIPTDIR= $(prefix)/lib
+SCRIPTDIR= $(prefix)/lib64
ABIFLAGS= @ABIFLAGS@
# Detailed destination directories
diff -Naur Python-3.7.0.orig/Modules/getpath.c Python-3.7.0/Modules/getpath.c
--- Python-3.7.0.orig/Modules/getpath.c 2018-06-27 04:07:35.000000000 +0100
+++ Python-3.7.0/Modules/getpath.c 2018-10-20 10:59:43.167459382 +0100
@@ -500,7 +500,7 @@
"Could not find platform dependent libraries <exec_prefix>\n");
}
wcsncpy(exec_prefix, calculate->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.) */
}
@@ -742,7 +742,7 @@
else {
wcsncpy(calculate->zip_path, calculate->prefix, MAXPATHLEN);
}
- joinpath(calculate->zip_path, L"lib/python00.zip");
+ joinpath(calculate->zip_path, L"lib64/python00.zip");
/* Replace "00" with version */
size_t bufsz = wcslen(calculate->zip_path);
@@ -867,7 +867,7 @@
if (!calculate->prefix) {
return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
}
- calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len);
+ calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len);
if (!calculate->lib_python) {
return DECODE_LOCALE_ERR("EXEC_PREFIX define", len);
}
diff -Naur Python-3.7.0.orig/configure Python-3.7.0/configure
--- Python-3.7.0.orig/configure 2018-06-27 04:07:35.000000000 +0100
+++ Python-3.7.0/configure 2018-10-20 10:59:43.170459385 +0100
@@ -14982,9 +14982,9 @@
if test x$PLATFORM_TRIPLET = x; then
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
else
- LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
+ LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
fi
diff -Naur Python-3.7.0.orig/setup.py Python-3.7.0/setup.py
--- Python-3.7.0.orig/setup.py 2018-06-27 04:07:35.000000000 +0100
+++ Python-3.7.0/setup.py 2018-10-20 10:59:43.171459386 +0100
@@ -541,7 +541,7 @@
# 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:
@@ -847,7 +847,7 @@
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'],