diff options
Diffstat (limited to 'source/d/python3/python3.x86_64.diff')
| -rw-r--r-- | source/d/python3/python3.x86_64.diff | 94 |
1 files changed, 54 insertions, 40 deletions
diff --git a/source/d/python3/python3.x86_64.diff b/source/d/python3/python3.x86_64.diff index 1649c2344..85f62b1ef 100644 --- a/source/d/python3/python3.x86_64.diff +++ b/source/d/python3/python3.x86_64.diff @@ -1,6 +1,20 @@ ---- ./configure.orig 2018-12-23 15:37:36.000000000 -0600 -+++ ./configure 2019-02-19 16:02:14.585002930 -0600 -@@ -15149,9 +15149,9 @@ +--- ./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 @@ if test x$PLATFORM_TRIPLET = x; then @@ -12,9 +26,9 @@ fi ---- ./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 @@ +--- ./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 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -23,8 +37,8 @@ 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 +--- ./Lib/sysconfig.py.orig 2019-12-18 11:21:23.000000000 -0600 ++++ ./Lib/sysconfig.py 2019-12-29 18:07:37.322132144 -0600 @@ -20,10 +20,10 @@ _INSTALL_SCHEMES = { @@ -70,9 +84,9 @@ 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', ---- ./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 @@ +--- ./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 @@ seen.add(prefix) if os.sep == '/': @@ -81,8 +95,8 @@ "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 +--- ./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 @@ -29,15 +29,15 @@ INSTALL_SCHEMES = { @@ -103,9 +117,9 @@ '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 @@ +--- ./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 @@ if os.name == "posix": libpython = os.path.join(prefix, @@ -114,28 +128,28 @@ 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"); +--- ./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(); } - 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); +- 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; } -- 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) { +@@ -1197,7 +1197,7 @@ + if (!calculate->exec_prefix) { return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); } - calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len); @@ -143,14 +157,14 @@ 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 @@ +--- ./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 @@ # directories (i.e. '.' and 'Include') must be first. See issue # 10520. - if not cross_compiling: + 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: + if CROSS_COMPILING: |