<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/684bb1311c9a56b3cd5b99ff7c59e996013340ea">https://github.com/macports/macports-ports/commit/684bb1311c9a56b3cd5b99ff7c59e996013340ea</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 684bb1311c9 python39: update to 3.9.1
</span>684bb1311c9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 684bb1311c9a56b3cd5b99ff7c59e996013340ea
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Dec 8 21:44:12 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> python39: update to 3.9.1
</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/61284
</span>---
lang/python39/Portfile | 12 ++++----
lang/python39/files/builtin_bswap16.diff | 51 --------------------------------
lang/python39/files/implicit.patch | 43 +++++++++++++++++++++++++++
lang/python39/files/patch-setup.py.diff | 8 -----
4 files changed, 50 insertions(+), 64 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 06b336bbbce..f6849df95bd 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;'>@@ -6,7 +6,7 @@ PortGroup select 1.0
</span> name python39
# Remember to keep py39-tkinter and py39-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.9.1
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 6ebfe157f6e88d9eabfbaf3fa92129f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 822fd1ea11f3ca303a08317f6db61f2a1e03e5ef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9c73e63c99855709b9be0b3cc9e5b072cb60f37311e8c4e50f15576a0bf82854
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 61981498e75ac8f00adcb908281fadb6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 59e056f957252a03c83ce892ac0ef85a274fce58 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ patchfiles patch-setup.py.diff \
</span> patch-Lib-ctypes-macholib-dyld.py.diff \
patch-libedit.diff \
patch-configure-xcode4bug.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- builtin_bswap16.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.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;'>@@ -69,6 +69,8 @@ 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>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/files/builtin_bswap16.diff b/lang/python39/files/builtin_bswap16.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 77edaeae1bd..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39/files/builtin_bswap16.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/python/cpython/pull/21943
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Include/internal/pycore_byteswap.h.orig 2020-09-17 07:23:13.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Include/internal/pycore_byteswap.h 2020-09-21 00:26:56.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,11 +15,14 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error "this header requires Py_BUILD_CORE define"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if ((defined(__GNUC__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 8))) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || (defined(__clang__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && (__clang_major__ >= 4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- || (__clang_major__ == 3 && __clang_minor__ >= 2))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Don't break compilers that don't know about __has_builtin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __has_builtin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define __has_builtin(x) 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// No check for clang here, __has_builtin is used instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__GNUC__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 8))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* __builtin_bswap16() is available since GCC 4.8 and clang 3.2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __builtin_bswap32() is available since GCC 4.3,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- __builtin_bswap64() is available since GCC 4.3. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +37,7 @@ extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline uint16_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _Py_bswap16(uint16_t word)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _PY_HAVE_BUILTIN_BSWAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_PY_HAVE_BUILTIN_BSWAP) || __has_builtin(__builtin_bswap16)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return __builtin_bswap16(word);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(_MSC_VER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_BUILD_ASSERT(sizeof(word) == sizeof(unsigned short));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +52,7 @@ _Py_bswap16(uint16_t word)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline uint32_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _Py_bswap32(uint32_t word)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _PY_HAVE_BUILTIN_BSWAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_PY_HAVE_BUILTIN_BSWAP) || __has_builtin(__builtin_bswap32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return __builtin_bswap32(word);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(_MSC_VER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_BUILD_ASSERT(sizeof(word) == sizeof(unsigned long));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,7 +69,7 @@ _Py_bswap32(uint32_t word)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static inline uint64_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _Py_bswap64(uint64_t word)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _PY_HAVE_BUILTIN_BSWAP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_PY_HAVE_BUILTIN_BSWAP) || __has_builtin(__builtin_bswap64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return __builtin_bswap64(word);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(_MSC_VER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _byteswap_uint64(word);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/files/implicit.patch b/lang/python39/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..58080539569
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-12-08 21:09:53.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-12-08 21:16:15.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11074,10 +11074,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_attr_t attr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_t id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (pthread_attr_init(&attr)) exit(-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (pthread_create(&id, &attr, foo, NULL)) exit(-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (pthread_attr_init(&attr)) return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (pthread_create(&id, &attr, foo, NULL)) return (-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ac_fn_c_try_run "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15085,7 +15085,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Success: exit code 0 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15466,7 +15466,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(((-1)>>3 == -1) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (((-1)>>3 == -1) ? 0 : 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15936,6 +15936,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <poll.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python39/files/patch-setup.py.diff b/lang/python39/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 766de26aac4..8a973fc2343 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python39/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python39/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +30,3 @@
</span>
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2045,7 +2042,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # OS X 10.5 comes with libffi.dylib; the include files are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in /usr/include/ffi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ffi_inc_dirs.append('/usr/include/ffi')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not ffi_inc or ffi_inc[0] == '':
</span></pre><pre style='margin:0'>
</pre>