<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/31932fe861cc8b3ac2000d3c22e333e2d65781dd">https://github.com/macports/macports-ports/commit/31932fe861cc8b3ac2000d3c22e333e2d65781dd</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 31932fe python37, python36: fix compiler_fixup IndexError
</span>31932fe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 31932fe861cc8b3ac2000d3c22e333e2d65781dd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Oct 19 09:53:37 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> python37, python36: fix compiler_fixup IndexError
</span>---
lang/python36/Portfile | 2 +-
lang/python36/files/patch-_osx_support.py.diff | 12 +++++++-----
lang/python37/Portfile | 1 +
lang/python37/files/patch-_osx_support.py.diff | 12 +++++++-----
4 files changed, 16 insertions(+), 11 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 27dd80a..adf91d8 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;'>@@ -8,7 +8,7 @@ name python36
</span> epoch 20170717
# Remember to keep py36-tkinter and py36-gdbm's versions sync'd with this
version 3.6.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<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 fdeab3a..02304a3 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;'>@@ -9,8 +9,8 @@
</span> if m is None:
sysroot = '/'
else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/_osx_support.py.orig 2019-07-09 04:03:50.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/_osx_support.py 2019-09-30 09:39:16.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/_osx_support.py.orig 2019-07-03 06:25:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/_osx_support.py 2019-10-19 09:51:31.000000000 +1100
</span> @@ -211,7 +211,7 @@
if cv in _config_vars and cv not in os.environ:
flags = _config_vars[cv]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,13 +47,14 @@
</span>
if stripArch or 'ARCHFLAGS' in os.environ:
while True:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -337,11 +337,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -337,11 +337,17 @@
</span> compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
if stripSysroot:
- while True:
+ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for index in indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ index = indices[0]
</span> try:
- index = compiler_so.index('-isysroot')
- # Strip this argument and the next one:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,10 +65,11 @@
</span> + else:
+ # It's '-isysroot/some/path' in one arg
+ del compiler_so[index:index+1]
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span> except ValueError:
break
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,12 +353,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -349,12 +355,19 @@
</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;color:#808080;'>diff --git a/lang/python37/Portfile b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f10d9d..7ac4397 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ name python37
</span>
# Remember to keep py37-tkinter and py37-gdbm's versions sync'd with this
version 3.7.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python37/files/patch-_osx_support.py.diff b/lang/python37/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a1d8ed5..aeee2d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python37/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@
</span> if m is None:
sysroot = '/'
else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/_osx_support.py.orig 2019-07-09 04:03:50.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/_osx_support.py 2019-09-30 09:39:16.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/_osx_support.py.orig 2019-10-15 09:32:36.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/_osx_support.py 2019-10-19 09:47:44.000000000 +1100
</span> @@ -211,7 +211,7 @@
if cv in _config_vars and cv not in os.environ:
flags = _config_vars[cv]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,13 +47,14 @@
</span>
if stripArch or 'ARCHFLAGS' in os.environ:
while True:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -337,11 +337,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -337,11 +337,17 @@
</span> compiler_so = compiler_so + os.environ['ARCHFLAGS'].split()
if stripSysroot:
- while True:
+ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for index in indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ index = indices[0]
</span> try:
- index = compiler_so.index('-isysroot')
- # Strip this argument and the next one:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,10 +65,11 @@
</span> + else:
+ # It's '-isysroot/some/path' in one arg
+ del compiler_so[index:index+1]
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span> except ValueError:
break
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,12 +353,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -349,12 +355,19 @@
</span> # the universal build requires the usage of a universal SDK and not all
# users have that installed by default.
sysroot = None
</pre><pre style='margin:0'>
</pre>