<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/383eb4a84e458cfffd5f93e06152f539c2f2c49a">https://github.com/macports/macports-ports/commit/383eb4a84e458cfffd5f93e06152f539c2f2c49a</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 383eb4a python34: handle -isysroot without a space
</span>383eb4a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 383eb4a84e458cfffd5f93e06152f539c2f2c49a
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Nov 2 15:27:30 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> python34: handle -isysroot without a space
</span>---
lang/python34/Portfile | 5 +-
lang/python34/files/patch-_osx_support.py.diff | 132 +++++++++++++++++++++++++
2 files changed, 135 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/Portfile b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5b40eb..8be18bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ name python34
</span> epoch 20170810
# Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
version 3.4.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
deprecated.eol_version yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,8 @@ patchfiles patch-setup.py.diff \
</span> patch-openssl11.diff \
omit-local-site-packages.patch \
patch-Include-pyport.h.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uuid-64bit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-_osx_support.py.diff
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python34/files/patch-_osx_support.py.diff b/lang/python34/files/patch-_osx_support.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a2cfcb3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python34/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,132 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/_osx_support.py.orig 2019-03-19 03:51:26.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/_osx_support.py 2019-11-02 15:23:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,8 +210,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not alter a config var explicitly overriden by env var
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cv in _config_vars and cv not in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flags = re.sub('-arch\s+\w+\s', ' ', flags, re.ASCII)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flags = re.sub('-isysroot [^ \t]*', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = re.sub(r'-arch\s+\w+\s', ' ', flags, re.ASCII)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = re.sub(r'-isysroot\s*\S+', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _config_vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -232,7 +232,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if 'CC' in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _config_vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if re.search('-arch\s+ppc', _config_vars['CFLAGS']) is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if re.search(r'-arch\s+ppc', _config_vars['CFLAGS']) is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: Cannot use subprocess here because of bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # issues when building Python itself
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = os.system(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,7 +251,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for cv in _UNIVERSAL_CONFIG_VARS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cv in _config_vars and cv not in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flags = re.sub('-arch\s+ppc\w*\s', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = re.sub(r'-arch\s+ppc\w*\s', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _config_vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -267,7 +267,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for cv in _UNIVERSAL_CONFIG_VARS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cv in _config_vars and '-arch' in _config_vars[cv]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flags = re.sub('-arch\s+\w+\s', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = re.sub(r'-arch\s+\w+\s', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = flags + ' ' + arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,7 +287,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to /usr and /System/Library by either a standalone CLT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # package or the CLT component within Xcode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cflags = _config_vars.get('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 not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sdk = m.group(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not os.path.exists(sdk):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,7 +295,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not alter a config var explicitly overriden by env var
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cv in _config_vars and cv not in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- flags = re.sub(r'-isysroot\s+\S+(?:\s|$)', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = re.sub(r'-isysroot\s*\S+(?:\s|$)', ' ', flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _config_vars
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -320,7 +320,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stripArch = stripSysroot = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stripArch = '-arch' in cc_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- stripSysroot = '-isysroot' in cc_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stripSysroot = any(arg for arg in cc_args if arg.find('-isysroot') == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if stripArch or 'ARCHFLAGS' in os.environ:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while True:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,23 +338,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if stripSysroot:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while True:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- index = compiler_so.index('-isysroot')
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check if the SDK that is used during compilation actually exists,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the universal build requires the usage of a universal SDK and not all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # users have that installed by default.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysroot = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if '-isysroot' in cc_args:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- idx = cc_args.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sysroot = cc_args[idx+1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif '-isysroot' in compiler_so:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- idx = compiler_so.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sysroot = compiler_so[idx+1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ argvar = cc_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ indices = [i for i,x in enumerate(cc_args) 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;'>++ argvar = compiler_so
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for idx in indices:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if argvar[idx] == '-isysroot':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sysroot = argvar[idx+1]
</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;'>++ sysroot = argvar[idx][len('-isysroot'):]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sysroot and not os.path.isdir(sysroot):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from distutils import log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -465,7 +476,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ machine = 'fat'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- archs = re.findall('-arch\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ archs = re.findall(r'-arch\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ archs = tuple(sorted(set(archs)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if len(archs) == 1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/distutils/unixccompiler.py.orig 2019-03-19 03:51:26.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/distutils/unixccompiler.py 2019-11-02 14:37:27.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -262,7 +262,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # '-isysroot', calculate the SDK root if it is specified
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (and use it further on)
</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></pre><pre style='margin:0'>
</pre>