<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/e2c98fb44858b32e5f7563ac2bcdfafa25a58a09">https://github.com/macports/macports-ports/commit/e2c98fb44858b32e5f7563ac2bcdfafa25a58a09</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 e2c98fb4485 python3{7,8,9,10,11}: fix potential build failure
</span>e2c98fb4485 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e2c98fb44858b32e5f7563ac2bcdfafa25a58a09
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jan 7 00:30:00 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> python3{7,8,9,10,11}: fix potential build failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If setuptools 60 or later is installed, its copy of distutils will be
</span><span style='display:block; white-space:pre;color:#404040;'> used[1], apparently even when building the python stdlib. Unfortunately
</span><span style='display:block; white-space:pre;color:#404040;'> it doesn't seem to be completely compatible with the stdlib's build
</span><span style='display:block; white-space:pre;color:#404040;'> system (at least in some python versions). So ensure that the stdlib's
</span><span style='display:block; white-space:pre;color:#404040;'> own distutils is used.
</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/64352
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://setuptools.pypa.io/en/latest/history.html#v60-0-0
</span>---
lang/python310/Portfile | 5 ++++-
lang/python311-devel/Portfile | 5 ++++-
lang/python37/Portfile | 5 ++++-
lang/python38/Portfile | 5 +++++
lang/python39/Portfile | 5 ++++-
5 files changed, 21 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310/Portfile b/lang/python310/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d11c711df12..b590f61caaa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,10 @@ configure.args --enable-framework=${frameworks_dir} \
</span>
configure.ccache no
# pkg-config removes -I flags for paths in CPATH, which confuses python.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python311-devel/Portfile b/lang/python311-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e28d6ddccb..0c0a4a9f1b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python311-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python311-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,10 @@ configure.args --enable-framework=${frameworks_dir} \
</span>
configure.ccache no
# pkg-config removes -I flags for paths in CPATH, which confuses python.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python37/Portfile b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aaeb6e15610..98bbc2bd1dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,10 @@ configure.args --enable-framework=${frameworks_dir} \
</span>
configure.ccache no
# pkg-config removes -I flags for paths in CPATH, which confuses python.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/Portfile b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c93cc45b71..ac5d38cbc26 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,6 +75,11 @@ configure.args --enable-framework=${frameworks_dir} \
</span> --with-system-ffi
configure.ccache no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# pkg-config removes -I flags for paths in CPATH, which confuses python.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/Portfile b/lang/python39/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f2689f3ab2..ce3b69da4ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,10 @@ configure.args --enable-framework=${frameworks_dir} \
</span>
configure.ccache no
# pkg-config removes -I flags for paths in CPATH, which confuses python.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env SETUPTOOLS_USE_DISTUTILS=stdlib
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
</pre><pre style='margin:0'>
</pre>