<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/931916b70904cd76a684ea36703b1cc069838f92">https://github.com/macports/macports-ports/commit/931916b70904cd76a684ea36703b1cc069838f92</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 931916b python38: update to 3.8.3
</span>931916b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 931916b70904cd76a684ea36703b1cc069838f92
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri May 15 08:42:40 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> python38: update to 3.8.3
</span>---
lang/python38/Portfile | 11 ++-
lang/python38/files/patch-_osx_support.py.diff | 105 -------------------------
2 files changed, 5 insertions(+), 111 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/Portfile b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 282a879..efd515f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ name python38
</span>
epoch 1
# Remember to keep py38-tkinter and py38-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.8.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.8.3
</span> revision 0
set major [lindex [split $version .] 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,17 +27,16 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8a03650894857d2b7be679613646ad1fff22d98e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17869888
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f52a96c9edac6c135114c8d0766e5f64bea7fb0f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dfab5ec723c218082fe3d5d7ae17ecbdebffa9a1aea4d64aa3a2ecdd2e795864 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17912964
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
patch-configure.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
patch-libedit.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-xcode4bug.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure-xcode4bug.diff
</span>
if {${os.platform} eq "darwin" && ${os.major} < 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/files/patch-_osx_support.py.diff b/lang/python38/files/patch-_osx_support.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ed57665..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/_osx_support.py.orig 2019-12-10 09:52:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/_osx_support.py 2019-12-10 09:52:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if cv in _config_vars and cv not in os.environ:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags = re.sub(r'-arch\s+\w+\s', ' ', flags, flags=re.ASCII)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- flags = re.sub('-isysroot [^ \t]*', ' ', flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags = re.sub(r'-isysroot\s*\S+', ' ', flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _config_vars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,7 +287,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to /usr and /System/Library by either a standalone CLT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # package or the CLT component within Xcode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags = _config_vars.get('CFLAGS', '')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sdk = m.group(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not os.path.exists(sdk):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -295,7 +295,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Do not alter a config var explicitly overridden by env var
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if cv in _config_vars and cv not in os.environ:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- flags = re.sub(r'-isysroot\s+\S+(?:\s|$)', ' ', flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags = re.sub(r'-isysroot\s*\S+(?:\s|$)', ' ', flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _config_vars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -320,7 +320,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stripArch = stripSysroot = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stripArch = '-arch' in cc_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stripSysroot = '-isysroot' in cc_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stripSysroot = any(arg for arg in cc_args if arg.find('-isysroot') == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if stripArch or 'ARCHFLAGS' in os.environ:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while True:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -338,23 +338,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if stripSysroot:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while True:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- index = compiler_so.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not indices:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ index = indices[0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if compiler_so[index] == '-isysroot':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Strip this argument and the next one:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- del compiler_so[index:index+2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except ValueError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # It's '-isysroot/some/path' in one arg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ del compiler_so[index:index+1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check if the SDK that is used during compilation actually exists,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the universal build requires the usage of a universal SDK and not all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # users have that installed by default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sysroot = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if '-isysroot' in cc_args:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- idx = cc_args.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sysroot = cc_args[idx+1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif '-isysroot' in compiler_so:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- idx = compiler_so.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sysroot = compiler_so[idx+1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ argvar = cc_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ indices = [i for i,x in enumerate(cc_args) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not indices:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ argvar = compiler_so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for idx in indices:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if argvar[idx] == '-isysroot':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sysroot = argvar[idx+1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sysroot = argvar[idx][len('-isysroot'):]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sysroot and not os.path.isdir(sysroot):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from distutils import log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/distutils/unixccompiler.py.orig 2019-12-10 09:52:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/distutils/unixccompiler.py 2019-12-10 09:52:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -288,7 +288,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # vs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /usr/lib/libedit.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags = sysconfig.get_config_var('CFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m is None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sysroot = '/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2019-12-21 16:03:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2019-12-21 16:04:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +146,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return MACOS_SDK_ROOT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags = sysconfig.get_config_var('CFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACOS_SDK_ROOT = m.group(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span></pre><pre style='margin:0'>
</pre>