<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/d275a24edbefe7f361f2aa6eb8f59648092058c0">https://github.com/macports/macports-ports/commit/d275a24edbefe7f361f2aa6eb8f59648092058c0</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 d275a24edbe python310-devel: update to 3.10.0a7
</span>d275a24edbe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d275a24edbefe7f361f2aa6eb8f59648092058c0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Apr 9 16:07:18 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> python310-devel: update to 3.10.0a7
</span>---
lang/python310-devel/Portfile | 54 ++++++++++++++--------
.../python310-devel/files/distutils_spawn.py.patch | 29 ++++++++++++
lang/python310-devel/files/patch-configure.diff | 17 +++++--
lang/python310-devel/files/sysconfig.py.patch | 11 +++++
4 files changed, 90 insertions(+), 21 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 4f0f9503478..246ff012538 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.0a6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.10.0a7
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,15 +24,17 @@ 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 948f385cba3438aaac31c5e4ae4c4657 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 38fdc49a5d1fdc0f2f5053a9a7f9617bc157bda2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 70ddd5898b996394103d114185429212dadeaf60fa260054712731bc126dca5c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 541c60c4eac4ef59baa4e5dcfe0fad0f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 64f93b09fe81a8d8066c8f0079318501db0063f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 513199724498513e7098c46bf6442192f5ffef32478d92499704aeeff3516db2
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
patch-configure.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-xcode4bug.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure-xcode4bug.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sysconfig.py.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distutils_spawn.py.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} < 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,11 +121,9 @@ platform darwin {
</span> # work for dependents that incorrectly use this variable to find out
# how to link against python (see ticket #15099); instead we mirror
# the behavior of `python-config --ldflags` here.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${buildlibdir} "awk -F : \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \"/'LINKFORSHARED'/ {printf \\\"%s: '-L${framewdir}/lib/python${branch}/${confdir}\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lpython${branch} -ldl -framework CoreFoundation',\\n\\\", \\\$1; getline; next} {print}\"\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _sysconfigdata__darwin_darwin.py > _sysconfigdata__darwin_darwin.py.new"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force ${buildlibdir}/_sysconfigdata__darwin_darwin.py.new \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lfs_pattern {^([[:space:]]*'LINKFORSHARED':).*}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set lfs_replacement "\\1 '-L${framewdir}/lib/python${branch}/${confdir} -lpython${branch} -ldl -framework CoreFoundation',"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E s|${lfs_pattern}|${lfs_replacement}| \
</span> ${buildlibdir}/_sysconfigdata__darwin_darwin.py
# remove -arch flags from the config
<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/python310-devel/files/distutils_spawn.py.patch b/lang/python310-devel/files/distutils_spawn.py.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8403b095101
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310-devel/files/distutils_spawn.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/pypa/distutils/pull/36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/distutils/spawn.py b/distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a73b8b9..b012d00 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/distutils/spawn.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,13 +60,17 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=0, env=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if _cfg_target:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _cfg_target_split = [int(x) for x in _cfg_target.split('.')]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if _cfg_target:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # ensure that the deployment target of build process is not less
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # than that used when the interpreter was built. This ensures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # extension modules are built with correct compatibility values
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Ensure that the deployment target of the build process is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # less than 10.3 if the interpreter was built for 10.3 or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # This ensures extension modules are built with correct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # compatibility values, specifically LDSHARED which can use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # '-undefined dynamic_lookup' which only works on >= 10.3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cur_target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', _cfg_target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if _cfg_target_split > [int(x) for x in cur_target.split('.')]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cur_target_split = [int(x) for x in cur_target.split('.')]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if _cfg_target_split[:2] >= [10, 3] and cur_target_split[:2] < [10, 3]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my_msg = ('$MACOSX_DEPLOYMENT_TARGET mismatch: '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'now "%s" but "%s" during configure'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'now "%s" but "%s" during configure;'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'must use 10.3 or later'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ % (cur_target, _cfg_target))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise DistutilsPlatformError(my_msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env = dict(os.environ,
</span><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 87dd75a5e76..4be28841cba 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;'>@@ -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 2021-03-02 03:48:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-03-18 00:35:14.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3629,6 +3629,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;'>+@@ -8207,6 +8209,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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310-devel/files/sysconfig.py.patch b/lang/python310-devel/files/sysconfig.py.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..005390d5a48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310-devel/files/sysconfig.py.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Lib/sysconfig.py.orig 2021-03-02 03:48:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Lib/sysconfig.py 2021-03-18 00:19:40.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -429,7 +429,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f.write('# system configuration generated and used by'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ' the sysconfig module\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f.write('build_time_vars = ')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pprint.pprint(vars, stream=f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pprint.pprint(vars, stream=f, width=4000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create file used for sys.path fixup -- see Modules/getpath.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with open('pybuilddir.txt', 'w', encoding='utf8') as f:
</span></pre><pre style='margin:0'>
</pre>