<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/956b21a6bf190d61f49749bedcd9b9c3b697bfd4">https://github.com/macports/macports-ports/commit/956b21a6bf190d61f49749bedcd9b9c3b697bfd4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 956b21a6bf190d61f49749bedcd9b9c3b697bfd4
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Wed Dec 9 21:20:04 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-kiwisolver: attempt to fix build on 10.5
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/61752
</span>---
 python/py-kiwisolver/Portfile                  |  6 ++++++
 python/py-kiwisolver/files/patch-setup.py.diff | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-kiwisolver/Portfile b/python/py-kiwisolver/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 140502fd838..2fd53280ede 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-kiwisolver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-kiwisolver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,12 @@ if {${name} ne ${subport}} {
</span> 
         depends_build-append \
                     port:py${python.version}-cppy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # on 10.5 the build fails with the error (see ticket 61752):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # gcc-mp-7: error: unrecognized command line option '-stdlib=libc++'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            patchfiles-append   patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-kiwisolver/files/patch-setup.py.diff b/python/py-kiwisolver/files/patch-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7033034aa93
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-kiwisolver/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On 10.5 the build fails with the error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gcc-mp-7: error: unrecognized command line option '-stdlib=libc++'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+see Trac ticket: https://trac.macports.org/ticket/61752
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py~      2020-11-02 03:14:28.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2020-12-06 02:15:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,9 +54,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         for ext in self.extensions:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ext.include_dirs.insert(0, cppy.get_include())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             ext.extra_compile_args = opts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                ext.extra_compile_args += ['-stdlib=libc++']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                ext.extra_link_args += ['-stdlib=libc++']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             if (ct == 'msvc' and os.environ.get('KIWI_DISABLE_FH4')):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 # Disable FH4 Exception Handling implementation so that we don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 # require VCRUNTIME140_1.dll. For more details, see:
</span></pre><pre style='margin:0'>

</pre>