<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/17ec20a1521512400a4cb30662ae9398fdd0b630">https://github.com/macports/macports-ports/commit/17ec20a1521512400a4cb30662ae9398fdd0b630</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 17ec20a1521 python310-devel: update to 3.10.0a4
</span>17ec20a1521 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 17ec20a1521512400a4cb30662ae9398fdd0b630
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jan 7 22:18:32 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> python310-devel: update to 3.10.0a4
</span>---
lang/python310-devel/Portfile | 11 +++---
lang/python310-devel/files/implicit.patch | 43 ----------------------
.../files/patch-configure-xcode4bug.diff | 10 ++---
.../files/patch-no-copyfile-on-Tiger.diff | 10 +----
lang/python310-devel/files/patch-setup.py.diff | 12 +++---
5 files changed, 17 insertions(+), 69 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 f3511f16fb4..4a3853d3a01 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.0a3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.10.0a4
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,17 +24,16 @@ 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 693a4a5ce7a1c1149d29187b37d3850f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a2d9e0b307e1e81a85a97fb4c10db42b60de018a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b098c97407713947d7ed6ed58a8486771960a7697230e3d98e0e3630277f2586
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 f59708a8a36365d58a82f75c374ebd5f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e7d0df03f0128aa42916455d178437c061591eaf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 31c1c197b219b8e1fdea37bf8b3931babd04762ae7fa281591053fa5b7a4ef73
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
patch-configure.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
patch-libedit.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-xcode4bug.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure-xcode4bug.diff
</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;color:#808080;'>diff --git a/lang/python310-devel/files/implicit.patch b/lang/python310-devel/files/implicit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2669faf957a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310-devel/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-12-08 20:09:29.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-12-08 20:35:46.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11110,10 +11110,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_attr_t attr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_t id;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (pthread_attr_init(&attr)) exit(-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (pthread_create(&id, &attr, foo, NULL)) exit(-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pthread_attr_init(&attr)) return (-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) return (-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pthread_create(&id, &attr, foo, NULL)) return (-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ac_fn_c_try_run "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15132,7 +15132,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Success: exit code 0 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15513,7 +15513,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(((-1)>>3 == -1) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (((-1)>>3 == -1) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15983,6 +15983,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <poll.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310-devel/files/patch-configure-xcode4bug.diff b/lang/python310-devel/files/patch-configure-xcode4bug.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d43c56cad2..13a0c96f26c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310-devel/files/patch-configure-xcode4bug.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310-devel/files/patch-configure-xcode4bug.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,12 @@ https://bugs.python.org/issue24844
</span> Compiling python fails in Xcode 4 (clang < 3.3) where existence of 'atomic'
is detected by configure, but it is not fully functional.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-11-08 19:37:57.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-11-08 19:52:06.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16802,6 +16802,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- volatile int val = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-01-05 04:26:00.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-01-07 20:27:22.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17110,6 +17110,24 @@
</span> int main() {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- __atomic_load_n(&val, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __atomic_store_n(&val, 1, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (void)__atomic_load_n(&val, __ATOMIC_SEQ_CST);
</span> +
+ /* https://bugs.python.org/issue24844 */
+ #define VERSION_CHECK(cc_major, cc_minor, req_major, req_minor) \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310-devel/files/patch-no-copyfile-on-Tiger.diff b/lang/python310-devel/files/patch-no-copyfile-on-Tiger.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cbbfae0c16e..6d101b1bd9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310-devel/files/patch-no-copyfile-on-Tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310-devel/files/patch-no-copyfile-on-Tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,14 +41,6 @@ diff --git Modules/posixmodule.c Modules/posixmodule.c
</span> index 01e8bcb..ff7fb30 100644
--- Modules/posixmodule.c
+++ Modules/posixmodule.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,6 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test macro, e.g. '_MSC_VER'. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Step 1 of support for weak-linking a number of symbols existing on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * OSX 10.4 and later, see the comment in the #ifdef __APPLE__ block
</span> @@ -109,7 +110,7 @@ corresponding Unix manual entries for more information on calls.");
# include <sys/sendfile.h>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +60,7 @@ index 01e8bcb..ff7fb30 100644
</span> os._fcopyfile
@@ -14671,7 +14672,7 @@ all_ins(PyObject *m)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (PyModule_AddIntMacro(m, EFD_SEMAPHORE)) return -1;
</span> #endif
-#if defined(__APPLE__)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python310-devel/files/patch-setup.py.diff b/lang/python310-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a973fc2343..ab3ebc1e10f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python310-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python310-devel/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2019-10-15 00:34:47.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2019-11-08 13:48:58.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEST_EXTENSIONS = True
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-01-05 04:26:00.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-01-07 21:55:50.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEST_EXTENSIONS = (sysconfig.get_config_var('TEST_MODULES') == 'yes')
</span>
# This global variable is used to hold the list of modules to be disabled.
-DISABLED_MODULE_LIST = []
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
def get_platform():
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -648,9 +648,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -728,9 +728,6 @@
</span> # Ensure that /usr/local is always used, but the local build
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span> # only change this for cross builds for 3.3, issues on Mageia
if CROSS_COMPILING:
self.add_cross_compiling_paths()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1851,8 +1848,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1985,8 +1982,8 @@
</span> # Rather than complicate the code below, detecting and building
# AquaTk is a separate method. Only one Tkinter will be built on
# Darwin - either AquaTk, if it is found, or X11 based Tk.
</pre><pre style='margin:0'>
</pre>