<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/4cfc3d6e2fa4d507771d17c8c347dfe6734b191a">https://github.com/macports/macports-ports/commit/4cfc3d6e2fa4d507771d17c8c347dfe6734b191a</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 4cfc3d6e2fa python39: attempt to fix universal build
</span>4cfc3d6e2fa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4cfc3d6e2fa4d507771d17c8c347dfe6734b191a
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jan 12 05:56:46 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> python39: attempt to fix universal build
</span>---
lang/python39/Portfile | 34 ++++++++++++++++++++++++--------
lang/python39/files/patch-configure.diff | 17 +++++++++++++---
2 files changed, 40 insertions(+), 11 deletions(-)
<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 f6849df95bd..7b1438d8a6c 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;'>@@ -176,20 +176,38 @@ variant universal {
</span> post-patch {
set universal_arch_flags {}
set arch_run_32bit {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_32bit_flags {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any64 no
</span> foreach arch ${universal_archs} {
lappend universal_arch_flags -arch ${arch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch} eq "i386" || ${arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} in {i386 ppc}} {
</span> lappend arch_run_32bit -${arch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend lipo_32bit_flags -extract ${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set any64 yes
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch_run_32bit} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$any64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$arch_run_32bit eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_run_32bit true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_32bit_flags ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_run_32bit "/usr/bin/arch $arch_run_32bit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #lipo_32bit_flags already correct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arch_run_32bit ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_32bit_flags ""
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@UNIVERSAL_ARCH_FLAGS@@|${universal_arch_flags}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@LIPO_32BIT_FLAGS@@|${lipo_32bit_flags}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@ARCH_RUN_32BIT@@|${arch_run_32bit}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span> }
if {${configure.sdkroot} ne ""} {
configure.args-append --enable-universalsdk=${configure.sdkroot}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/files/patch-configure.diff b/lang/python39/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 87dd75a5e76..d285a93a641 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-10-15 00:34:47.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-11-08 14:00:55.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3192,6 +3192,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-12-08 01:02:38.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-01-12 05:49:39.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3222,6 +3222,8 @@
</span> ;;
esac
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,14 @@
</span> prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
# Add files for Mac specific code to the list of output
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7511,6 +7513,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNIVERSAL_ARCH_FLAGS="@@UNIVERSAL_ARCH_FLAGS@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIPO_32BIT_FLAGS="@@LIPO_32BIT_FLAGS@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ARCH_RUN_32BIT="@@ARCH_RUN_32BIT@@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${UNIVERSALSDK}" != "/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
</span></pre><pre style='margin:0'>
</pre>