2019-12-31 06:17:04 +01:00
|
|
|
--- ./configure.ac.orig 2019-12-18 11:21:23.000000000 -0600
|
|
|
|
+++ ./configure.ac 2019-12-29 18:07:37.316132144 -0600
|
|
|
|
@@ -4668,9 +4668,9 @@
|
|
|
|
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
|
|
|
AC_SUBST(PY_ENABLE_SHARED)
|
|
|
|
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
|
|
|
|
AC_SUBST(LIBPL)
|
|
|
|
|
|
|
|
--- ./configure.orig 2019-12-18 11:21:23.000000000 -0600
|
|
|
|
+++ ./configure 2019-12-29 18:07:37.320132144 -0600
|
|
|
|
@@ -15170,9 +15170,9 @@
|
2018-05-28 21:12:29 +02:00
|
|
|
|
|
|
|
|
2019-02-21 00:59:17 +01:00
|
|
|
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
|
2018-05-28 21:12:29 +02:00
|
|
|
|
2019-02-21 00:59:17 +01:00
|
|
|
|
2019-12-31 06:17:04 +01:00
|
|
|
--- ./Makefile.pre.in.orig 2019-12-18 11:21:23.000000000 -0600
|
|
|
|
+++ ./Makefile.pre.in 2019-12-29 18:07:37.321132144 -0600
|
|
|
|
@@ -143,7 +143,7 @@
|
2019-02-21 00:59:17 +01:00
|
|
|
MANDIR= @mandir@
|
|
|
|
INCLUDEDIR= @includedir@
|
|
|
|
CONFINCLUDEDIR= $(exec_prefix)/include
|
|
|
|
-SCRIPTDIR= $(prefix)/lib
|
|
|
|
+SCRIPTDIR= $(prefix)/lib64
|
|
|
|
ABIFLAGS= @ABIFLAGS@
|
|
|
|
|
|
|
|
# Detailed destination directories
|
2019-12-31 06:17:04 +01:00
|
|
|
--- ./Lib/sysconfig.py.orig 2019-12-18 11:21:23.000000000 -0600
|
|
|
|
+++ ./Lib/sysconfig.py 2019-12-29 18:07:37.322132144 -0600
|
2018-05-28 21:12:29 +02:00
|
|
|
@@ -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',
|
2019-02-21 00:59:17 +01:00
|
|
|
@@ -62,10 +62,10 @@
|
2018-05-28 21:12:29 +02:00
|
|
|
'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}',
|
2019-12-31 06:17:04 +01:00
|
|
|
--- ./Lib/site.py.orig 2019-12-18 11:21:23.000000000 -0600
|
|
|
|
+++ ./Lib/site.py 2019-12-29 18:07:37.324132144 -0600
|
|
|
|
@@ -335,7 +335,7 @@
|
2019-02-21 00:59:17 +01:00
|
|
|
seen.add(prefix)
|
2018-05-28 21:12:29 +02:00
|
|
|
|
2019-02-21 00:59:17 +01:00
|
|
|
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:
|
2019-12-31 06:17:04 +01:00
|
|
|
--- ./Lib/distutils/command/install.py.orig 2019-12-18 11:21:23.000000000 -0600
|
|
|
|
+++ ./Lib/distutils/command/install.py 2019-12-29 18:10:30.181135838 -0600
|
2019-02-21 00:59:17 +01:00
|
|
|
@@ -29,15 +29,15 @@
|
2018-05-28 21:12:29 +02:00
|
|
|
|
2019-02-21 00:59:17 +01: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$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',
|
2019-12-31 06:17:04 +01:00
|
|
|
--- ./Lib/distutils/sysconfig.py.orig 2019-12-18 11:21:23.000000000 -0600
|
|
|
|
+++ ./Lib/distutils/sysconfig.py 2019-12-29 18:07:37.325132144 -0600
|
|
|
|
@@ -147,7 +147,7 @@
|
2019-02-21 00:59:17 +01:00
|
|
|
|
|
|
|
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:
|
2019-12-31 06:17:04 +01:00
|
|
|
--- ./Modules/getpath.c.orig 2019-12-18 11:21:23.000000000 -0600
|
|
|
|
+++ ./Modules/getpath.c 2019-12-29 18:07:37.326132144 -0600
|
|
|
|
@@ -730,7 +730,7 @@
|
|
|
|
if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) {
|
|
|
|
return PATHLEN_ERR();
|
|
|
|
}
|
|
|
|
- status = joinpath(exec_prefix, L"lib/lib-dynload", exec_prefix_len);
|
|
|
|
+ status = joinpath(exec_prefix, L"lib64/lib-dynload", exec_prefix_len);
|
|
|
|
if (_PyStatus_EXCEPTION(status)) {
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
@@ -1067,7 +1067,7 @@
|
|
|
|
return PATHLEN_ERR();
|
2019-02-21 00:59:17 +01:00
|
|
|
}
|
2018-05-28 21:12:29 +02:00
|
|
|
}
|
2019-12-31 06:17:04 +01:00
|
|
|
- status = joinpath(zip_path, L"lib/python00.zip", zip_path_len);
|
|
|
|
+ status = joinpath(zip_path, L"lib64/python00.zip", zip_path_len);
|
|
|
|
if (_PyStatus_EXCEPTION(status)) {
|
|
|
|
return status;
|
2019-02-21 00:59:17 +01:00
|
|
|
}
|
2019-12-31 06:17:04 +01:00
|
|
|
@@ -1197,7 +1197,7 @@
|
|
|
|
if (!calculate->exec_prefix) {
|
2019-02-21 00:59:17 +01:00
|
|
|
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);
|
|
|
|
}
|
2019-12-31 06:17:04 +01:00
|
|
|
--- ./setup.py.orig 2019-12-18 11:21:23.000000000 -0600
|
|
|
|
+++ ./setup.py 2019-12-29 18:07:37.327132144 -0600
|
|
|
|
@@ -649,7 +649,7 @@
|
2018-05-28 21:12:29 +02:00
|
|
|
# directories (i.e. '.' and 'Include') must be first. See issue
|
|
|
|
# 10520.
|
2019-12-31 06:17:04 +01:00
|
|
|
if not CROSS_COMPILING:
|
2018-05-28 21:12:29 +02:00
|
|
|
- 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
|
2019-12-31 06:17:04 +01:00
|
|
|
if CROSS_COMPILING:
|