<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/5339b1b25ce230b1e47d291de97e5489423ea602">https://github.com/macports/macports-ports/commit/5339b1b25ce230b1e47d291de97e5489423ea602</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 5339b1b25ce python3{4,5}: fix breakage due to openssl pg
</span>5339b1b25ce is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5339b1b25ce230b1e47d291de97e5489423ea602
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jun 7 07:18:40 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> python3{4,5}: fix breakage due to openssl pg
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The portgroup replaces -I with -isystem, which breaks python's ability
</span><span style='display:block; white-space:pre;color:#404040;'> to detect header dependencies for its stdlib modules.
</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/65301
</span>---
lang/python34/Portfile | 11 +++++------
lang/python35/Portfile | 11 +++++------
2 files changed, 10 insertions(+), 12 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 178ef2b82e3..be44fca26a1 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;'>@@ -10,7 +10,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 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 10
</span>
deprecated.eol_version yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,6 @@ set major [lindex [split $version .] 0]
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
license PSF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {jmr @jmroot} openmaintainer
description An interpreted, object-oriented programming language
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +61,11 @@ depends_lib port:bzip2 \
</span> depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't let the portgroup use -isystem, it breaks lib detection for modules.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.configure
</span> openssl.branch 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-prepend -I[openssl::include_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-prepend -L[openssl::lib_dir]
</span>
platform darwin arm {
known_fail yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,9 +136,7 @@ platform darwin {
</span> # poll() misbehaves on 10.8 and older
# See https://trac.macports.org/ticket/18376
if {${os.major} <= 12} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
</span> system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${worksrcpath}/pyconfig.h $oldmtime
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,9 +217,7 @@ variant universal {
</span> }
configure.args-append --enable-universalsdk=${configure.sysroot}
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
</span> system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${worksrcpath}/pyconfig.h $oldmtime
</span> }
post-destroot {
<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 3eca4678967..b4a01a54a24 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;'>@@ -10,7 +10,7 @@ name python35
</span> epoch 20170810
# Remember to keep py35-tkinter and py35-gdbm's versions sync'd with this
version 3.5.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span>
deprecated.eol_version yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,6 @@ set major [lindex [split $version .] 0]
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
license PSF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {jmr @jmroot} openmaintainer
description An interpreted, object-oriented programming language
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +61,11 @@ depends_lib port:bzip2 \
</span> depends_run port:python_select \
port:python3_select
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't let the portgroup use -isystem, it breaks lib detection for modules.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.configure
</span> openssl.branch 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-prepend -I[openssl::include_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-prepend -L[openssl::lib_dir]
</span>
platform darwin arm {
known_fail yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,9 +136,7 @@ platform darwin {
</span> # poll() misbehaves on 10.8 and older
# See https://trac.macports.org/ticket/18376
if {${os.major} <= 12} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
</span> system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${worksrcpath}/pyconfig.h $oldmtime
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -217,9 +218,7 @@ variant universal {
</span> }
configure.args-append --enable-universalsdk=${configure.sysroot}
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldmtime [file mtime ${worksrcpath}/pyconfig.h]
</span> system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mtime ${worksrcpath}/pyconfig.h $oldmtime
</span> }
post-destroot {
</pre><pre style='margin:0'>
</pre>