summaryrefslogtreecommitdiff
path: root/source/d/python3/python3.x86_64.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/d/python3/python3.x86_64.diff')
-rw-r--r--source/d/python3/python3.x86_64.diff194
1 files changed, 93 insertions, 101 deletions
diff --git a/source/d/python3/python3.x86_64.diff b/source/d/python3/python3.x86_64.diff
index 182fc629..1649c234 100644
--- a/source/d/python3/python3.x86_64.diff
+++ b/source/d/python3/python3.x86_64.diff
@@ -1,53 +1,30 @@
-diff -uar Python-3.6.1.orig/Lib/distutils/command/install.py Python-3.6.1/Lib/distutils/command/install.py
---- Python-3.6.1.orig/Lib/distutils/command/install.py 2017-03-21 08:32:38.000000000 +0200
-+++ Python-3.6.1/Lib/distutils/command/install.py 2017-03-22 21:42:23.915962369 +0200
-@@ -29,15 +29,15 @@
+--- ./configure.orig 2018-12-23 15:37:36.000000000 -0600
++++ ./configure 2019-02-19 16:02:14.585002930 -0600
+@@ -15149,9 +15149,9 @@
- 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 -uar Python-3.6.1.orig/Lib/distutils/sysconfig.py Python-3.6.1/Lib/distutils/sysconfig.py
---- Python-3.6.1.orig/Lib/distutils/sysconfig.py 2017-03-21 08:32:38.000000000 +0200
-+++ Python-3.6.1/Lib/distutils/sysconfig.py 2017-03-22 21:42:23.915962369 +0200
-@@ -133,7 +133,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-3.6.1.orig/Lib/site.py Python-3.6.1/Lib/site.py
---- Python-3.6.1.orig/Lib/site.py 2017-03-21 08:32:38.000000000 +0200
-+++ Python-3.6.1/Lib/site.py 2017-03-22 21:42:23.915962369 +0200
-@@ -304,7 +304,7 @@
- seen.add(prefix)
+ 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
- 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 -uar Python-3.6.1.orig/Lib/sysconfig.py Python-3.6.1/Lib/sysconfig.py
---- Python-3.6.1.orig/Lib/sysconfig.py 2017-03-21 08:32:38.000000000 +0200
-+++ Python-3.6.1/Lib/sysconfig.py 2017-03-22 21:42:23.916962405 +0200
+
+--- ./Makefile.pre.in.orig 2018-12-23 15:37:36.000000000 -0600
++++ ./Makefile.pre.in 2019-02-19 16:02:14.576002930 -0600
+@@ -142,7 +142,7 @@
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
+-SCRIPTDIR= $(prefix)/lib
++SCRIPTDIR= $(prefix)/lib64
+ ABIFLAGS= @ABIFLAGS@
+
+ # Detailed destination directories
+--- ./Lib/sysconfig.py.orig 2018-12-23 15:37:36.000000000 -0600
++++ ./Lib/sysconfig.py 2019-02-19 16:02:14.574002930 -0600
@@ -20,10 +20,10 @@
_INSTALL_SCHEMES = {
@@ -78,7 +55,7 @@ diff -uar Python-3.6.1.orig/Lib/sysconfig.py Python-3.6.1/Lib/sysconfig.py
'include': '{installed_base}/include/python',
'platinclude': '{installed_base}/include/python',
'scripts': '{base}/bin',
-@@ -61,10 +61,10 @@
+@@ -62,10 +62,10 @@
'data': '{userbase}',
},
'posix_user': {
@@ -93,67 +70,82 @@ diff -uar Python-3.6.1.orig/Lib/sysconfig.py Python-3.6.1/Lib/sysconfig.py
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data': '{userbase}',
-diff -uar Python-3.6.1.orig/Makefile.pre.in Python-3.6.1/Makefile.pre.in
---- Python-3.6.1.orig/Makefile.pre.in 2017-03-21 08:32:38.000000000 +0200
-+++ Python-3.6.1/Makefile.pre.in 2017-03-22 21:42:23.916962405 +0200
-@@ -131,7 +131,7 @@
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
-+SCRIPTDIR= $(prefix)/lib64
- ABIFLAGS= @ABIFLAGS@
+--- ./Lib/site.py.orig 2018-12-23 15:37:36.000000000 -0600
++++ ./Lib/site.py 2019-02-19 16:02:14.572002930 -0600
+@@ -334,7 +334,7 @@
+ seen.add(prefix)
- # Detailed destination directories
-diff -uar Python-3.6.1.orig/Modules/getpath.c Python-3.6.1/Modules/getpath.c
---- Python-3.6.1.orig/Modules/getpath.c 2017-03-21 08:32:38.000000000 +0200
-+++ Python-3.6.1/Modules/getpath.c 2017-03-22 21:42:23.917962441 +0200
-@@ -494,7 +494,7 @@
- _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
- _prefix = Py_DecodeLocale(PREFIX, NULL);
- _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
-- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
-+ lib_python = Py_DecodeLocale("lib64/python" VERSION, NULL);
+ 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:
+--- ./Lib/distutils/command/install.py.orig 2018-12-23 15:37:36.000000000 -0600
++++ ./Lib/distutils/command/install.py 2019-02-19 16:02:14.567002930 -0600
+@@ -29,15 +29,15 @@
- if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
- Py_FatalError(
-@@ -683,7 +683,7 @@
- }
- else
- wcsncpy(zip_path, _prefix, MAXPATHLEN);
-- joinpath(zip_path, L"lib/python00.zip");
-+ joinpath(zip_path, L"lib64/python00.zip");
- bufsz = wcslen(zip_path); /* Replace "00" with version */
- zip_path[bufsz - 6] = VERSION[0];
- zip_path[bufsz - 5] = VERSION[2];
-@@ -695,7 +695,7 @@
- fprintf(stderr,
+ 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',
+--- ./Lib/distutils/sysconfig.py.orig 2018-12-23 15:37:36.000000000 -0600
++++ ./Lib/distutils/sysconfig.py 2019-02-19 16:02:14.570002930 -0600
+@@ -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:
+--- ./Modules/getpath.c.orig 2019-02-19 16:02:14.580002930 -0600
++++ ./Modules/getpath.c 2019-02-19 16:06:51.535002940 -0600
+@@ -500,7 +500,7 @@
"Could not find platform dependent libraries <exec_prefix>\n");
- wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
+ }
+ 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");
-diff -uar Python-3.6.1.orig/configure Python-3.6.1/configure
---- Python-3.6.1.orig/configure 2017-03-21 08:32:38.000000000 +0200
-+++ Python-3.6.1/configure 2017-03-22 21:42:23.920962550 +0200
-@@ -14963,9 +14963,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 -uar Python-3.6.1.orig/setup.py Python-3.6.1/setup.py
---- Python-3.6.1.orig/setup.py 2017-03-21 08:32:38.000000000 +0200
-+++ Python-3.6.1/setup.py 2017-03-22 21:47:59.638077062 +0200
-@@ -491,7 +491,7 @@
+ /* 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);
+ }
+--- ./setup.py.orig 2018-12-23 15:37:36.000000000 -0600
++++ ./setup.py 2019-02-19 16:02:14.587002930 -0600
+@@ -546,7 +546,7 @@
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
if not cross_compiling:
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-15 14:20:59 +0000