<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/318365cfb72013580e86ada20095b887d87881eb">https://github.com/macports/macports-ports/commit/318365cfb72013580e86ada20095b887d87881eb</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 318365c python36: update to 3.6.10
</span>318365c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 318365cfb72013580e86ada20095b887d87881eb
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Dec 21 21:49:58 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> python36: update to 3.6.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Only disable poll on OS versions where it's broken. Update sysroot
</span><span style='display:block; white-space:pre;color:#404040;'> patch to upstreamed version.
</span>---
lang/python36/Portfile | 14 ++---
lang/python36/files/patch-_osx_support.py.diff | 74 ++++++++++++++------------
python/py-gdbm/Portfile | 8 +--
python/py-tkinter/Portfile | 8 +--
4 files changed, 57 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/Portfile b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index adf91d8..b884723 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,7 @@ name python36
</span>
epoch 20170717
# Remember to keep py36-tkinter and py36-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.10
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +25,9 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 e229451dcb4f2ce8b0cac174bf309e0a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3ccbe94ae221ccfb03fcd97840149a89b7135bc0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5e2f5f554e3f8f7f0296f7e73d8600c4e9acbaee6b2555b83206edf5153870da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 986078f11b39074be22a199e56491d98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cf326d5d0fa468da181c537cbd6b91723e686b64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0a833c398ac8cd7c5538f7232d8531afef943c60495c504484f308dac3af40de
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,8 +95,11 @@ platform darwin {
</span> set framewdir ${framewpath}/Versions/${branch}
set confdir config-${branch}m-darwin
post-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # poll() misbehaves on 10.8 and older
</span> # See https://trac.macports.org/ticket/18376
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-build {
set buildlibdir [lindex [glob -directory ${worksrcpath}/build lib.*-*-*-${branch}] 0]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python36/files/patch-_osx_support.py.diff b/lang/python36/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 02304a3..a88d8a5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python36/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python36/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/distutils/unixccompiler.py.orig 2019-07-03 06:25:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/distutils/unixccompiler.py 2019-10-16 23:24:39.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -282,7 +282,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;'>---- Lib/_osx_support.py.orig 2019-07-03 06:25:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/_osx_support.py 2019-10-19 09:51:31.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/_osx_support.py.orig 2019-12-19 06:26:36.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/_osx_support.py 2019-12-21 21:40:37.000000000 +1100
</span> @@ -211,7 +211,7 @@
if cv in _config_vars and cv not in os.environ:
flags = _config_vars[cv]
flags = re.sub(r'-arch\s+\w+\s', ' ', flags, flags=re.ASCII)
- flags = re.sub('-isysroot [^ \t]*', ' ', flags)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags = re.sub('-isysroot\s*\S+', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = re.sub(r'-isysroot\s*\S+', ' ', flags)
</span> _save_modified_value(_config_vars, cv, flags)
return _config_vars
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,29 +36,26 @@
</span>
if stripArch or 'ARCHFLAGS' in os.environ:
while True:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -337,11 +337,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,23 +338,34 @@
</span>
if stripSysroot:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- while True:
</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;'>-+ while indices:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ index = indices[0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while True:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- try:
</span> - index = compiler_so.index('-isysroot')
<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;'>-+ 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;'>-+ 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;'>-+ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</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:#e0ffe0;'>++ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if not indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ index = indices[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if compiler_so[index] == '-isysroot':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Strip this argument and the next one:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ del compiler_so[index:index+2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- except ValueError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # It's '-isysroot/some/path' in one arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ del compiler_so[index:index+1]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,12 +355,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check if the SDK that is used during compilation actually exists,
</span> # the universal build requires the usage of a universal SDK and not all
# users have that installed by default.
sysroot = None
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,3 +81,25 @@
</span>
if sysroot and not os.path.isdir(sysroot):
from distutils import log
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/distutils/unixccompiler.py.orig 2019-12-19 06:26:36.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/distutils/unixccompiler.py 2019-12-21 21:39:17.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -282,7 +282,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # vs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # /usr/lib/libedit.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags = sysconfig.get_config_var('CFLAGS')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if m is None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysroot = '/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2019-12-21 21:36:50.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2019-12-21 21:38:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ or '/' if no SDK was specified.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags = sysconfig.get_config_var('CFLAGS')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if m is None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysroot = '/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gdbm/Portfile b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc11c87..0f8fdb5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,13 +98,13 @@ subport py35-gdbm {
</span> subport py36-gdbm {
maintainers {jmr @jmroot} openmaintainer
epoch 20170717
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.6.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.6.10
</span> revision 0
homepage https://docs.python.org/release/${version}/library/dbm.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 e229451dcb4f2ce8b0cac174bf309e0a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3ccbe94ae221ccfb03fcd97840149a89b7135bc0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5e2f5f554e3f8f7f0296f7e73d8600c4e9acbaee6b2555b83206edf5153870da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 986078f11b39074be22a199e56491d98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cf326d5d0fa468da181c537cbd6b91723e686b64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0a833c398ac8cd7c5538f7232d8531afef943c60495c504484f308dac3af40de
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
livecheck.regex {Python (3\.6\.[0-9]+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tkinter/Portfile b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f179dc1..46c376a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,13 +93,13 @@ subport py35-tkinter {
</span> subport py36-tkinter {
maintainers {jmr @jmroot} openmaintainer
epoch 20170717
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.6.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.6.10
</span> revision 0
homepage https://docs.python.org/release/${version}/library/tkinter.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 e229451dcb4f2ce8b0cac174bf309e0a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3ccbe94ae221ccfb03fcd97840149a89b7135bc0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5e2f5f554e3f8f7f0296f7e73d8600c4e9acbaee6b2555b83206edf5153870da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 986078f11b39074be22a199e56491d98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cf326d5d0fa468da181c537cbd6b91723e686b64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0a833c398ac8cd7c5538f7232d8531afef943c60495c504484f308dac3af40de
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>