<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8b1f42c206da90d02ecd41914e8b3ed0dbdba1d3">https://github.com/macports/macports-ports/commit/8b1f42c206da90d02ecd41914e8b3ed0dbdba1d3</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 8b1f42c python39-devel: update to 3.9.0a6
</span>8b1f42c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8b1f42c206da90d02ecd41914e8b3ed0dbdba1d3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat May 2 04:19:13 2020 +1000
<span style='display:block; white-space:pre;color:#404040;'> python39-devel: update to 3.9.0a6
</span>---
lang/python39-devel/Portfile | 11 ++-
.../files/patch-_osx_support.py.diff | 98 ----------------------
lang/python39-devel/files/patch-setup.py.diff | 9 --
3 files changed, 5 insertions(+), 113 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39-devel/Portfile b/lang/python39-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c2e3a7..559bb08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup select 1.0
</span> name python39-devel
# Remember to keep py39-tkinter and py39-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.9.0a5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.9.0a6
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,17 +24,16 @@ master_sites ${homepage}ftp/python/3.9.0/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 c97c78252aeb3695b9582561dfe79bb8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9e41d10d45a790d0368210e5073512bc0e221743 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3260e1587a4ec22081e409f701b0db5f76fab2d447fbaf0e5ddc1ce3a932f06e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 6b5d9b7fcbc7d3a79217bb1587bae16e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 22d9977aaede5748d1ebac4f939529129229e33d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 628627f23cc0733a73ca98500c7cb8d39019975c6ab3cbe709e9771fc6cca36d
</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>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39-devel/files/patch-_osx_support.py.diff b/lang/python39-devel/files/patch-_osx_support.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 760ee16..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39-devel/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,98 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index db6674ea293fb..79eec6067aed1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/_osx_support.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/_osx_support.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,7 +211,7 @@ def _remove_universal_flags(_config_vars):
</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 @@ def _check_for_unavailable_sdk(_config_vars):
</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 @@ def _check_for_unavailable_sdk(_config_vars):
</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 @@ def compiler_fixup(compiler_so, cc_args):
</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 @@ def compiler_fixup(compiler_so, cc_args):
</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;'>-diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d10a78da31140..4d7a6de740ab3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/distutils/unixccompiler.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/distutils/unixccompiler.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -288,7 +288,7 @@ def find_library_file(self, dirs, lib, debug=0):
</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;color:#808080;'>diff --git a/lang/python39-devel/files/patch-setup.py.diff b/lang/python39-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1840f35..766de26 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,15 +9,6 @@
</span>
def get_platform():
<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> @@ -648,9 +648,6 @@
# Ensure that /usr/local is always used, but the local build
# directories (i.e. '.' and 'Include') must be first. See issue
</pre><pre style='margin:0'>
</pre>