<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/59a332f730edbcd4e8ff3af74bef228531f43b9f">https://github.com/macports/macports-ports/commit/59a332f730edbcd4e8ff3af74bef228531f43b9f</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 59a332f python3{3,4,5}: fix sysconfig patching
</span>59a332f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 59a332f730edbcd4e8ff3af74bef228531f43b9f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Mar 30 03:05:34 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> python3{3,4,5}: fix sysconfig patching
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove -arch flags correctly and also remove -lintl, which causes
</span><span style='display:block; white-space:pre;color:#404040;'> overlinking.
</span>---
lang/python33/Portfile | 8 +++++++-
lang/python34/Portfile | 8 +++++++-
lang/python35/Portfile | 8 +++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python33/Portfile b/lang/python33/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a29da03..b9ba31e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python33/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ name python33
</span> epoch 20141012
# Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
version 3.3.7
<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;background:#e0e0e0;'>@@ -119,7 +120,12 @@ post-destroot {
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/$confdir/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # also remove gettext overlinking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lintl||" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata.py
</span> }
platform darwin {
<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 d703909..a0baed2 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;'>@@ -8,6 +8,7 @@ name python34
</span> epoch 20170810
# Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
version 3.4.8
<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;background:#e0e0e0;'>@@ -119,7 +120,12 @@ post-destroot {
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/$confdir/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # also remove gettext overlinking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lintl||" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata.py
</span> foreach unversioned {2to3 idle3 pydoc3 python3 python3-config pyvenv} {
delete ${destroot}${prefix}/bin/${unversioned}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python35/Portfile b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15e90a7..d7989e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python35/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ name python35
</span> epoch 20170810
# Remember to keep py35-tkinter and py35-gdbm's versions sync'd with this
version 3.5.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;background:#e0e0e0;'>@@ -120,7 +121,12 @@ post-destroot {
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/$confdir/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # also remove gettext overlinking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lintl||" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/${confdir}/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${framewdir}/lib/python${branch}/_sysconfigdata.py
</span> foreach unversioned {2to3 idle3 pydoc3 python3 python3-config pyvenv} {
delete ${destroot}${prefix}/bin/${unversioned}
}
</pre><pre style='margin:0'>
</pre>