<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/c004ec08ab62ca43262841a22e17851e9903aab0">https://github.com/macports/macports-ports/commit/c004ec08ab62ca43262841a22e17851e9903aab0</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 c004ec08ab6 python310-devel: update to 3.10.0b4
</span>c004ec08ab6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c004ec08ab62ca43262841a22e17851e9903aab0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jul 12 13:09:52 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> python310-devel: update to 3.10.0b4
</span>---
lang/python310-devel/Portfile | 25 ++++++++++++++-----------
lang/python310-devel/files/patch-configure.diff | 3 ++-
2 files changed, 16 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310-devel/Portfile b/lang/python310-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d32e91510e1..9d30b9bb4b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup select 1.0
</span> name python310-devel
# Remember to keep py310-tkinter and py310-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.10.0b3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.10.0b4
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ master_sites ${homepage}ftp/python/3.10.0/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 760a09c3773ad44ba48bf9bcb09c3c64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f73716cd986d9f57b72f0496f129ab8d158f5416 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2267aed4d01015176bcfe645ac6ca36e05f0c30a76f1f9973863692f6e25cc15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 986102c269f938ff38b47e0cbfc6583b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0815da5de1230a80c3959309a81ec5b9633f750d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 27d2f40401144830bd89d632002d1ab7c7898637f098d83e813e3edf70dd3b40
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,8 +176,9 @@ variant universal {
</span> set universal_arch_flags {}
set arch_run_32bit {}
set lipo_32bit_flags {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_intel64_flags {}
</span> set any64 no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span> lappend universal_arch_flags -arch ${arch}
if {${arch} in {i386 ppc}} {
lappend arch_run_32bit -${arch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,6 +195,9 @@ variant universal {
</span> set arch_run_32bit "/usr/bin/arch $arch_run_32bit"
#lipo_32bit_flags already correct
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"arm64" in ${configure.universal_archs} && "x86_64" in ${configure.universal_archs}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lipo_intel64_flags "-extract x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
set arch_run_32bit ""
set lipo_32bit_flags ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,21 +208,20 @@ variant universal {
</span> reinplace \
"s|@@LIPO_32BIT_FLAGS@@|${lipo_32bit_flags}|" \
${worksrcpath}/configure
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@LIPO_INTEL64_FLAGS@@|${lipo_intel64_flags}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span> reinplace \
"s|@@ARCH_RUN_32BIT@@|${arch_run_32bit}|" \
${worksrcpath}/configure
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-universalsdk=${configure.sysroot}
</span> post-configure {
system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach unversioned {python3-32} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach unversioned {python3-32 python3-intel64} {
</span> delete ${destroot}${prefix}/bin/${unversioned}
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310-devel/files/patch-configure.diff b/lang/python310-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4be28841cba..b73d7d1a568 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,12 +9,13 @@
</span> prefix=$PYTHONFRAMEWORKINSTALLDIR/Versions/$VERSION
# Add files for Mac specific code to the list of output
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8207,6 +8209,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8207,6 +8209,11 @@
</span> ;;
esac
+ UNIVERSAL_ARCH_FLAGS="@@UNIVERSAL_ARCH_FLAGS@@"
+ LIPO_32BIT_FLAGS="@@LIPO_32BIT_FLAGS@@"
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIPO_INTEL64_FLAGS="@@LIPO_INTEL64_FLAGS@@"
</span> + ARCH_RUN_32BIT="@@ARCH_RUN_32BIT@@"
+
if test "${UNIVERSALSDK}" != "/"
</pre><pre style='margin:0'>
</pre>