<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/efb1b95f2d20f268aafb7026cdd0c75e059c5db2">https://github.com/macports/macports-ports/commit/efb1b95f2d20f268aafb7026cdd0c75e059c5db2</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 efb1b95 python pg: support Mojave with /usr/include
</span>efb1b95 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit efb1b95f2d20f268aafb7026cdd0c75e059c5db2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Oct 3 18:27:30 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> python pg: support Mojave with /usr/include
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some users may have installed the optional package that provides system
</span><span style='display:block; white-space:pre;color:#404040;'> headers in /usr/include.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/59108
</span>---
_resources/port1.0/group/python-1.0.tcl | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/python-1.0.tcl b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 67aa6e3..a8b1454 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,10 +152,16 @@ proc python_set_versions {option action args} {
</span> if {${python.set_cxx_stdlib}} {
set pycxxflags [portconfigure::construct_cxxflags $pycxxflags]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.set_sdkroot} && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append pycflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append pycxxflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append pyobjcflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.set_sdkroot}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycxxflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pyobjcflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycflags " -isysroot/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycxxflags " -isysroot/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pyobjcflags " -isysroot/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {$pycflags ne ""} {
if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,10 +230,16 @@ proc python_set_versions {option action args} {
</span> if {${python.set_cxx_stdlib} && ${python.consistent_destroot}} {
set pycxxflags [portconfigure::construct_cxxflags $pycxxflags]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.set_sdkroot} && ${python.consistent_destroot} && ${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append pycflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append pycxxflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append pyobjcflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.set_sdkroot} && ${python.consistent_destroot}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycxxflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pyobjcflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycflags " -isysroot/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycxxflags " -isysroot/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pyobjcflags " -isysroot/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {$pycflags ne ""} {
if {[vercmp [macports_version] 2.5.99] >= 0} {
</pre><pre style='margin:0'>
</pre>