Update pyenv---version

README: clarify behavior of `pyenv latest`

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Version History
 
+## Release 2.3.14
+
+* Fix indentation by @rafrafek in https://github.com/pyenv/pyenv/pull/2620
+* Support for "BusyBox version" of "head" by @schuellerf in https://github.com/pyenv/pyenv/pull/2629
+* bpo-27987 for v3.5.10 and v3.6.15: align by 16bytes on 64bit platforms by @chaimleib in https://github.com/pyenv/pyenv/pull/2630
+* bpo-36231 for v3.5.10: fix Unsupported MacOS X CPU type in ffi.h by @chaimleib in https://github.com/pyenv/pyenv/pull/2633
+* README: clarify behavior of `pyenv latest` by @mrienstra in https://github.com/pyenv/pyenv/pull/2634
+
 ## Release 2.3.13
 
 * Fix pyenv-latest to ignore virtualenvs by @native-api in https://github.com/pyenv/pyenv/pull/2608

README.md

@@ -416,7 +416,7 @@ please visit the wiki page about
 
 All Pyenv subcommands except `uninstall` automatically resolve full prefixes to the latest version in the corresponding version line.
 
-`pyenv install` picks the latest known version while other subcommands -- the latest installed version.
+`pyenv install` picks the latest known version, while other subcommands pick the latest installed version.
 
 E.g. to install and then switch to the latest 3.10 release:
 
@@ -425,8 +425,7 @@ pyenv install 3.10
 pyenv global 3.10
 ```
 
-You can run [`pyenv latest <prefix>`](COMMANDS.md#pyenv-latest) to see
+You can run [`pyenv latest -k <prefix>`](COMMANDS.md#pyenv-latest) to see how `pyenv install` would resolve a specific prefix, or [`pyenv latest <prefix>`](COMMANDS.md#pyenv-latest) to see how other subcommands would resolve it.
-what a specific prefix would be resolved to.
 
 See the [`pyenv latest` documentation](COMMANDS.md#pyenv-latest) for details.
 

libexec/pyenv

@@ -29,7 +29,7 @@ if enable -f "${BASH_SOURCE%/*}"/../libexec/pyenv-realpath.dylib realpath 2>/dev
 else
   [ -z "$PYENV_NATIVE_EXT" ] || abort "failed to load \`realpath' builtin"
 
-  READLINK=$(type -P greadlink readlink | head -1)
+  READLINK=$(type -P greadlink readlink | head -n1)
   [ -n "$READLINK" ] || abort "cannot find readlink - are you missing GNU coreutils?"
 
   resolve_link() {

libexec/pyenv---version

@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="2.3.13"
+version="2.3.14"
 git_revision=""
 
 if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then

libexec/pyenv-help

@@ -46,7 +46,7 @@ extract_initial_comment_block() {
 collect_documentation() {
   # `tail` prevents "broken pipe" errors due to `head` closing the pipe without reading everything
   # https://superuser.com/questions/554855/how-can-i-fix-a-broken-pipe-error/642932#642932
-  $(type -P gawk awk | tail -n +1 | head -1) '
+  $(type -P gawk awk | tail -n +1 | head -n1) '
     /^Summary:/ {
       summary = substr($0, 10)
       next

libexec/pyenv-hooks

@@ -26,7 +26,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
     echo "pyenv: failed to load \`realpath' builtin" >&2
     exit 1
   fi
-READLINK=$(type -P greadlink readlink | head -1)
+READLINK=$(type -P greadlink readlink | head -n1)
 if [ -z "$READLINK" ]; then
   echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
   exit 1

libexec/pyenv-versions

@@ -34,7 +34,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
     exit 1
   fi
 
-  READLINK=$(type -P greadlink readlink | head -1)
+  READLINK=$(type -P greadlink readlink | head -n1)
   if [ -z "$READLINK" ]; then
     echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
     exit 1
@@ -157,12 +157,12 @@ for path in "${versions_dir_entries[@]}"; do
     print_version "${path##*/}" "$path"
     # virtual environments created by anaconda/miniconda/pyenv-virtualenv
     if [[ -z $skip_envs ]]; then
-    for env_path in "${path}/envs/"*; do
+      for env_path in "${path}/envs/"*; do
-      if [ -d "${env_path}" ]; then
+        if [ -d "${env_path}" ]; then
-        print_version "${env_path#${PYENV_ROOT}/versions/}" "${env_path}"
+          print_version "${env_path#${PYENV_ROOT}/versions/}" "${env_path}"
-      fi
+        fi
-    done
+      done
-  fi
+    fi
   fi
 done
 shopt -u dotglob nullglob

plugins/python-build/bin/pyenv-install

@@ -59,7 +59,7 @@ usage() {
 
 definitions() {
   local query="$1"
-  python-build --definitions | $(type -P ggrep grep | head -1) -F "$query" || true
+  python-build --definitions | $(type -P ggrep grep | head -n1) -F "$query" || true
 }
 
 indent() {

plugins/python-build/bin/python-build

@@ -58,7 +58,7 @@ lib "$1"
 
 
 resolve_link() {
-  $(type -P greadlink readlink | head -1) "$1"
+  $(type -P greadlink readlink | head -n1) "$1"
 }
 
 abs_dirname() {
@@ -102,7 +102,7 @@ os_information() {
     source /etc/os-release
     echo "$NAME" $VERSION_ID
   else
-    local os="$(cat /etc/{centos,redhat,fedora,system}-release /etc/debian_version 2>/dev/null | head -1)"
+    local os="$(cat /etc/{centos,redhat,fedora,system}-release /etc/debian_version 2>/dev/null | head -n1)"
     echo "${os:-$(uname -sr)}"
   fi
 }
@@ -256,7 +256,7 @@ compute_sha2() {
     output="$(shasum -a 256 -b)" || return 1
     echo "${output% *}"
   elif type openssl &>/dev/null; then
-    local openssl="$(command -v "$(brew --prefix openssl 2>/dev/null || true)"/bin/openssl openssl | head -1)"
+    local openssl="$(command -v "$(brew --prefix openssl 2>/dev/null || true)"/bin/openssl openssl | head -n1)"
     output="$("$openssl" dgst -sha256 2>/dev/null)" || return 1
     echo "${output##* }"
   elif type sha256sum &>/dev/null; then
@@ -867,7 +867,7 @@ build_package_jython() {
 fix_jython_shebangs() {
   # Workaround for Jython 2.7+ (#458)
   for file in "${PREFIX_PATH}/bin"/*; do
-    case "$(head -1 "${file}")" in
+    case "$(head -n1 "${file}")" in
     "#!"*"/bin/jython" )
       sed -i.bak "1 s:.*:#\!${PREFIX_PATH}\/bin\/jython:" "${file}"
       ;;
@@ -1144,7 +1144,7 @@ fix_directory_permissions() {
 }
 
 require_java7() {
-  local version="$(java -version 2>&1 | grep '\(java\|openjdk\) version' | head -1)"
+  local version="$(java -version 2>&1 | grep '\(java\|openjdk\) version' | head -n1)"
   if [[ $version != *[789]* ]]; then
     colorize 1 "ERROR" >&3
     echo ": Java 7 required. Please install a 1.7-compatible JRE." >&3
@@ -1587,7 +1587,7 @@ build_package_verify_openssl() {
       RbConfig::CONFIG.fetch("configure_args").shellsplit.each { |arg| $stderr.puts "  #{arg}" }
       exit 1
     end
-  ' "$(basename "$(type -P yum apt-get | head -1)")" >&4 2>&1
+  ' "$(basename "$(type -P yum apt-get | head -n1)")" >&4 2>&1
 }
 
 use_homebrew_zlib() {

plugins/python-build/share/python-build/patches/3.5.10/Python-3.5.10/0001-bpo-27987-pymalloc-align-by-16bytes-on-64bit-platfor.patch

@@ -0,0 +1,43 @@
+From 112cceb514e79b4c9805f9e5ea037a205be428da Mon Sep 17 00:00:00 2001
+From: Inada Naoki <songofacandy@gmail.com>
+Date: Tue, 14 May 2019 18:51:15 +0900
+Subject: [PATCH 1/2] bpo-27987: pymalloc: align by 16bytes on 64bit platform
+ (GH-12850)
+
+---
+ .../2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst                | 3 +++
+ Objects/obmalloc.c                                          | 6 ++++++
+ 2 files changed, 9 insertions(+)
+ create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst
+
+diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst b/Misc/NEWS.d/next/Core and Builtins/2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst
+new file mode 100644
+index 0000000000..b0f32a5c6c
+--- /dev/null
++++ b/Misc/NEWS.d/next/Core and Builtins/2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst	
+@@ -0,0 +1,3 @@
++pymalloc returns memory blocks aligned by 16 bytes, instead of 8 bytes, on
++64-bit platforms to conform x86-64 ABI. Recent compilers assume this alignment
++more often. Patch by Inada Naoki.
+diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
+index 9dd8421a33..da9029c4a6 100644
+--- a/Objects/obmalloc.c
++++ b/Objects/obmalloc.c
+@@ -540,8 +540,14 @@ static int running_on_valgrind = -1;
+  *
+  * You shouldn't change this unless you know what you are doing.
+  */
++
++#if SIZEOF_VOID_P > 4
++#define ALIGNMENT              16               /* must be 2^N */
++#define ALIGNMENT_SHIFT         4
++#else
+ #define ALIGNMENT               8               /* must be 2^N */
+ #define ALIGNMENT_SHIFT         3
++#endif
+ 
+ /* Return the number of bytes in size class I, as a uint. */
+ #define INDEX2SIZE(I) (((uint)(I) + 1) << ALIGNMENT_SHIFT)
+-- 
+2.38.4
+

plugins/python-build/share/python-build/patches/3.5.10/Python-3.5.10/0002-bpo-27987-align-PyGC_Head-to-alignof-long-double-GH-.patch

@@ -0,0 +1,40 @@
+From 618ef35426ecc57da1bee50f8dc5896f5fb178a9 Mon Sep 17 00:00:00 2001
+From: Inada Naoki <songofacandy@gmail.com>
+Date: Sat, 25 May 2019 21:13:33 +0900
+Subject: [PATCH 2/2] bpo-27987: align PyGC_Head to alignof(long double)
+ (GH-13335)
+
+---
+ Include/objimpl.h                                           | 6 +++++-
+ .../2019-05-15-18-28-43.bpo-27987.FaxuLy.rst                | 2 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-05-15-18-28-43.bpo-27987.FaxuLy.rst
+
+diff --git a/Include/objimpl.h b/Include/objimpl.h
+index 65b6d91c36..eaf57975c8 100644
+--- a/Include/objimpl.h
++++ b/Include/objimpl.h
+@@ -250,7 +250,11 @@ typedef union _gc_head {
+         union _gc_head *gc_prev;
+         Py_ssize_t gc_refs;
+     } gc;
+-    double dummy;  /* force worst-case alignment */
++    long double dummy;  /* force worst-case alignment */
++    // malloc returns memory block aligned for any built-in types and
++    // long double is the largest standard C type.
++    // On amd64 linux, long double requires 16 byte alignment.
++    // See bpo-27987 for more discussion.
+ } PyGC_Head;
+ 
+ extern PyGC_Head *_PyGC_generation0;
+diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-05-15-18-28-43.bpo-27987.FaxuLy.rst b/Misc/NEWS.d/next/Core and Builtins/2019-05-15-18-28-43.bpo-27987.FaxuLy.rst
+new file mode 100644
+index 0000000000..97ca37b262
+--- /dev/null
++++ b/Misc/NEWS.d/next/Core and Builtins/2019-05-15-18-28-43.bpo-27987.FaxuLy.rst	
+@@ -0,0 +1,2 @@
++``PyGC_Head`` structure is aligned to ``long double``.  This is needed to
++GC-ed objects are aligned properly.  Patch by Inada Naoki.
+-- 
+2.38.4
+

plugins/python-build/share/python-build/patches/3.5.10/Python-3.5.10/0003-bpo-45405-Prevent-internal-configure-error-when-runn.patch

@@ -0,0 +1,86 @@
+From 655f26bb742d6bd32c388e9fea14b64eb25fd4de Mon Sep 17 00:00:00 2001
+From: Ned Deily <nad@python.org>
+Date: Tue, 15 Mar 2022 03:18:39 -0400
+Subject: [PATCH] bpo-45405: Prevent internal configure error when running
+ configure with recent versions of clang. (GH-28845) (GH-31890)
+
+Change the configure logic to function properly on macOS when the compiler
+outputs a platform triplet for option --print-multiarch.
+The Apple Clang included with Xcode 13.3 now supports --print-multiarch
+causing configure to fail without this change.
+
+Co-authored-by: Ned Deily <nad@python.org>
+(cherry picked from commit 9c4766772cda67648184f8ddba546a5fc0167f91)
+
+Co-authored-by: David Bohman <debohman@gmail.com>
+(cherry picked from commit 720bb456dc711b0776bae837d1f9a0b10c28ddf2)
+---
+ .../next/Build/2021-10-11-16-27-38.bpo-45405.iSfdW5.rst   | 2 ++
+ configure                                                 | 8 +++++---
+ configure.ac                                              | 8 +++++---
+ 3 files changed, 12 insertions(+), 6 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Build/2021-10-11-16-27-38.bpo-45405.iSfdW5.rst
+
+diff --git a/Misc/NEWS.d/next/Build/2021-10-11-16-27-38.bpo-45405.iSfdW5.rst b/Misc/NEWS.d/next/Build/2021-10-11-16-27-38.bpo-45405.iSfdW5.rst
+new file mode 100644
+index 0000000000..13c93d1b8a
+--- /dev/null
++++ b/Misc/NEWS.d/next/Build/2021-10-11-16-27-38.bpo-45405.iSfdW5.rst
+@@ -0,0 +1,2 @@
++Prevent ``internal configure error`` when running ``configure``
++with recent versions of clang.  Patch by David Bohman.
+diff --git a/configure b/configure
+index fb0a499145..67e6e69b5f 100755
+--- a/configure
++++ b/configure
+@@ -5203,9 +5203,6 @@ $as_echo "$as_me:
+ fi
+ 
+ 
+-MULTIARCH=$($CC --print-multiarch 2>/dev/null)
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet based on compiler characteristics" >&5
+ $as_echo_n "checking for the platform triplet based on compiler characteristics... " >&6; }
+ cat >> conftest.c <<EOF
+@@ -5334,6 +5331,11 @@ $as_echo "none" >&6; }
+ fi
+ rm -f conftest.c conftest.out
+ 
++if test x$PLATFORM_TRIPLET != xdarwin; then
++  MULTIARCH=$($CC --print-multiarch 2>/dev/null)
++fi
++
++
+ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
+   if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
+     as_fn_error $? "internal configure error for the platform triplet, please file a bug report" "$LINENO" 5
+diff --git a/configure.ac b/configure.ac
+index d86dad9a7c..468ad6070f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -747,9 +747,6 @@ then
+ fi
+ 
+ 
+-MULTIARCH=$($CC --print-multiarch 2>/dev/null)
+-AC_SUBST(MULTIARCH)
+-
+ AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
+ cat >> conftest.c <<EOF
+ #undef bfin
+@@ -875,6 +872,11 @@ else
+ fi
+ rm -f conftest.c conftest.out
+ 
++if test x$PLATFORM_TRIPLET != xdarwin; then
++  MULTIARCH=$($CC --print-multiarch 2>/dev/null)
++fi
++AC_SUBST(MULTIARCH)
++
+ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
+   if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
+     AC_MSG_ERROR([internal configure error for the platform triplet, please file a bug report])
+-- 
+2.32.0 (Apple Git-132)
+

plugins/python-build/share/python-build/patches/3.5.10/Python-3.5.10/0004-Detect-arm64-in-configure.patch

@@ -0,0 +1,41 @@
+From 002501946bad91a308f37a09204393c172f03c3e Mon Sep 17 00:00:00 2001
+From: Takumi Sueda <puhitaku@gmail.com>
+Date: Sat, 11 Sep 2021 16:50:14 +0900
+Subject: [PATCH 2/6] Detect arm64 in configure
+
+---
+ configure    | 3 +++
+ configure.ac | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/configure b/configure
+index e39c16eee2..8dc1fc7595 100755
+--- a/configure
++++ b/configure
+@@ -9230,6 +9230,9 @@ fi
+     	ppc)
+     		MACOSX_DEFAULT_ARCH="ppc64"
+     		;;
++    	arm64)
++    		MACOSX_DEFAULT_ARCH="arm64"
++    		;;
+     	*)
+     		as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
+     		;;
+diff --git a/configure.ac b/configure.ac
+index cf280506bd..34846a7df3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2435,6 +2435,9 @@ case $ac_sys_system/$ac_sys_release in
+     	ppc)
+     		MACOSX_DEFAULT_ARCH="ppc64"
+     		;;
++    	arm64) 
++    		MACOSX_DEFAULT_ARCH="arm64" 
++    		;;
+     	*)
+     		AC_MSG_ERROR([Unexpected output of 'arch' on OSX])
+     		;;
+-- 
+2.30.1 (Apple Git-130)
+

plugins/python-build/share/python-build/patches/3.5.10/Python-3.5.10/0005-BPO-41100-Support-macOS-11-when-building-GH-21113.patch

@@ -0,0 +1,48 @@
+From 8ea6353f60625c96ce96588c70ff24a77f8c71f9 Mon Sep 17 00:00:00 2001
+From: Ronald Oussoren <ronaldoussoren@mac.com>
+Date: Thu, 25 Jun 2020 16:55:48 +0200
+Subject: [PATCH] BPO-41100: Support macOS 11 when building (GH-21113)
+
+---
+ Misc/NEWS.d/next/macOS/2020-06-24-13-51-57.bpo-41100.mcHdc5.rst | 1 +
+ configure                                                       | 2 +-
+ configure.ac                                                    | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/macOS/2020-06-24-13-51-57.bpo-41100.mcHdc5.rst
+
+diff --git a/Misc/NEWS.d/next/macOS/2020-06-24-13-51-57.bpo-41100.mcHdc5.rst b/Misc/NEWS.d/next/macOS/2020-06-24-13-51-57.bpo-41100.mcHdc5.rst
+new file mode 100644
+index 0000000000..ded66b567a
+--- /dev/null
++++ b/Misc/NEWS.d/next/macOS/2020-06-24-13-51-57.bpo-41100.mcHdc5.rst
+@@ -0,0 +1 @@
++Support macOS 11 when building.
+diff --git a/configure b/configure
+index c51f396824..5024860ca4 100755
+--- a/configure
++++ b/configure
+@@ -3375,7 +3375,7 @@ $as_echo "#define _BSD_SOURCE 1" >>confdefs.h
+   # has no effect, don't bother defining them
+   Darwin/[6789].*)
+     define_xopen_source=no;;
+-  Darwin/1[0-9].*)
++  Darwin/[12][0-9].*)
+     define_xopen_source=no;;
+   # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
+   # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
+diff --git a/configure.ac b/configure.ac
+index 70deefb6b9..5a3e340aa3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -495,7 +495,7 @@ case $ac_sys_system/$ac_sys_release in
+   # has no effect, don't bother defining them
+   Darwin/@<:@6789@:>@.*)
+     define_xopen_source=no;;
+-  Darwin/1@<:@0-9@:>@.*)
++  Darwin/@<:@[12]@:>@@<:@0-9@:>@.*)
+     define_xopen_source=no;;
+   # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
+   # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
+-- 
+2.30.1 (Apple Git-130)
+

plugins/python-build/share/python-build/patches/3.5.10/Python-3.5.10/0006-bpo-41100-fix-_decimal-for-arm64-Mac-OS-GH-21228.patch

@@ -0,0 +1,37 @@
+From 604d95e235d86465b8c17f02095edcaf18464d4c Mon Sep 17 00:00:00 2001
+From: Lawrence D'Anna <64555057+lawrence-danna-apple@users.noreply.github.com>
+Date: Tue, 30 Jun 2020 02:15:46 -0700
+Subject: [PATCH] bpo-41100: fix _decimal for arm64 Mac OS (GH-21228)
+
+Patch by Lawrence Danna.
+---
+ .../Core and Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst | 1 +
+ Modules/_decimal/libmpdec/mpdecimal.h                          | 3 +++
+ 2 files changed, 4 insertions(+)
+ create mode 100644 Misc/NEWS.d/next/Core and Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst
+
+diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst b/Misc/NEWS.d/next/Core and Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst
+new file mode 100644
+index 0000000000..d6176d69f0
+--- /dev/null
++++ b/Misc/NEWS.d/next/Core and Builtins/2020-06-30-04-44-29.bpo-41100.PJwA6F.rst	
+@@ -0,0 +1 @@
++add arm64 to the allowable Mac OS arches in mpdecimal.h
+\ No newline at end of file
+diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h
+index 108b76efa8..35ce429f60 100644
+--- a/Modules/_decimal/libmpdec/mpdecimal.h
++++ b/Modules/_decimal/libmpdec/mpdecimal.h
+@@ -135,6 +135,9 @@ const char *mpd_version(void);
+   #elif defined(__x86_64__)
+     #define CONFIG_64
+     #define ASM
++  #elif defined(__arm64__)
++    #define CONFIG_64
++    #define ANSI
+   #else
+     #error "unknown architecture for universal build."
+   #endif
+-- 
+2.30.1 (Apple Git-130)
+

plugins/python-build/share/python-build/patches/3.5.10/Python-3.5.10/0007-Port-ctypes-and-system-libffi-patch-for-arm64-macOS-.patch

@@ -0,0 +1,132 @@
+From 409b4ecef88643996ce00482b650c0246a977a4b Mon Sep 17 00:00:00 2001
+From: Chaim Halbert <chaim.leib.halbert@gmail.com>
+Date: Sun, 26 Feb 2023 06:21:54 -0700
+Subject: [PATCH] Port ctypes and system libffi patch for arm64/macOS 10.15+ to
+ Python 3.5.10
+
+This backports the following ctypes and libffi pyenv patch for Python
+3.6.15 to Python 3.5.10:
+
+* `0004-Port-ctypes-and-system-libffi-patches-for-arm64-macO.patch`
+
+This patch enables use of system libffi (fixing a broken `ctypes` module
+on arm64 targets) and enables calling variadic functions on arm64.
+---
+ setup.py | 65 +++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 50 insertions(+), 15 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 2944c9dd6f..ab8065866f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -73,6 +73,13 @@ def macosx_sdk_root():
+         sysroot = m.group(1)
+     return sysroot
+ 
++def is_macosx_at_least(vers):
++    if host_platform == 'darwin':
++        dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
++        if dep_target:
++            return tuple(map(int, str(dep_target).split('.'))) >= vers
++    return False
++
+ def is_macosx_sdk_path(path):
+     """
+     Returns True if 'path' can be located in an OSX SDK
+@@ -81,6 +88,13 @@ def is_macosx_sdk_path(path):
+                 or path.startswith('/System/')
+                 or path.startswith('/Library/') )
+ 
++def grep_headers_for(function, headers):
++    for header in headers:
++        with open(header, 'r') as f:
++            if function in f.read():
++                return True
++    return False
++
+ def find_file(filename, std_dirs, paths):
+     """Searches for the directory where a given file is located,
+     and returns a possibly-empty list of additional directories, or None
+@@ -1939,7 +1953,11 @@ class PyBuildExt(build_ext):
+         return True
+ 
+     def detect_ctypes(self, inc_dirs, lib_dirs):
+-        self.use_system_libffi = False
++        if not sysconfig.get_config_var("LIBFFI_INCLUDEDIR") and is_macosx_at_least((10,15)):
++            self.use_system_libffi = True
++        else:
++            self.use_system_libffi = '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS")
++
+         include_dirs = []
+         extra_compile_args = []
+         extra_link_args = []
+@@ -1986,19 +2004,29 @@ class PyBuildExt(build_ext):
+                      libraries=math_libs)
+         self.extensions.extend([ext, ext_test])
+ 
+-        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
+-            return
++        ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR")
++        ffi_lib = None
+ 
+         if host_platform == 'darwin':
+-            # OS X 10.5 comes with libffi.dylib; the include files are
+-            # in /usr/include/ffi
+-            inc_dirs.append('/usr/include/ffi')
+-
+-        ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
+-        if not ffi_inc or ffi_inc[0] == '':
+-            ffi_inc = find_file('ffi.h', [], inc_dirs)
+-        if ffi_inc is not None:
+-            ffi_h = ffi_inc[0] + '/ffi.h'
++             if not self.use_system_libffi:
++                 return
++             ffi_in_sdk = os.path.join(macosx_sdk_root(), "usr/include/ffi")
++             if os.path.exists(ffi_in_sdk):
++                 ffi_inc = ffi_in_sdk
++                 ffi_lib = 'ffi'
++             else:
++                 # OS X 10.5 comes with libffi.dylib; the include files are
++                 # in /usr/include/ffi
++                 inc_dirs.append('/usr/include/ffi')
++        elif '--without-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
++             return
++
++        if not ffi_inc:
++            found = find_file('ffi.h', [], inc_dirs)
++            if found:
++                ffi_inc = found[0]
++        if ffi_inc:
++            ffi_h = ffi_inc + '/ffi.h'
+             with open(ffi_h) as f:
+                 for line in f:
+                     line = line.strip()
+@@ -2009,15 +2037,22 @@ class PyBuildExt(build_ext):
+                     ffi_inc = None
+                     print('Header file {} does not define LIBFFI_H or '
+                           'ffi_wrapper_h'.format(ffi_h))
+-        ffi_lib = None
+-        if ffi_inc is not None:
++        if ffi_lib is None and ffi_inc is not None:
+             for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
+                 if (self.compiler.find_library_file(lib_dirs, lib_name)):
+                     ffi_lib = lib_name
+                     break
+ 
+         if ffi_inc and ffi_lib:
+-            ext.include_dirs.extend(ffi_inc)
++            ffi_headers = glob(os.path.join(ffi_inc, '*.h'))
++            if grep_headers_for('ffi_closure_alloc', ffi_headers):
++                try:
++                    sources.remove('_ctypes/malloc_closure.c')
++                except ValueError:
++                    pass
++            if grep_headers_for('ffi_prep_cif_var', ffi_headers):
++                ext.extra_compile_args.append("-DHAVE_FFI_PREP_CIF_VAR=1")
++            ext.include_dirs.append(ffi_inc)
+             ext.libraries.append(ffi_lib)
+             self.use_system_libffi = True
+ 
+-- 
+2.39.2
+

plugins/python-build/share/python-build/patches/3.5.10/Python-3.5.10/0008-bpo-36231-Support-building-on-macOS-without-usr-incl.patch

@@ -0,0 +1,93 @@
+From c7302116573d853d3181133477d9d0e4d4d3abfd Mon Sep 17 00:00:00 2001
+From: Ned Deily <nad@python.org>
+Date: Tue, 18 Jun 2019 16:28:13 -0400
+Subject: [PATCH] bpo-36231:  Support building on macOS without /usr/include
+ (GH-13773) (GH-14208)
+
+---
+ .../2019-06-03-05-49-49.bpo-36231.RfmW_p.rst  |  3 ++
+ setup.py                                      | 53 ++++++++++++++++---
+ 2 files changed, 49 insertions(+), 7 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/macOS/2019-06-03-05-49-49.bpo-36231.RfmW_p.rst
+
+diff --git a/Misc/NEWS.d/next/macOS/2019-06-03-05-49-49.bpo-36231.RfmW_p.rst b/Misc/NEWS.d/next/macOS/2019-06-03-05-49-49.bpo-36231.RfmW_p.rst
+new file mode 100644
+index 0000000000..c82e54c12c
+--- /dev/null
++++ b/Misc/NEWS.d/next/macOS/2019-06-03-05-49-49.bpo-36231.RfmW_p.rst
+@@ -0,0 +1,3 @@
++Support building Python on macOS without /usr/include installed. As of macOS
++10.14, system header files are only available within an SDK provided by
++either the Command Line Tools or the Xcode app.
+diff --git a/setup.py b/setup.py
+index bcc4bfa89d..5e0cd02430 100644
+--- a/setup.py
++++ b/setup.py
+@@ -90,18 +90,57 @@ def sysroot_paths(make_vars, subdirs):
+                 break
+     return dirs
+ 
++MACOS_SDK_ROOT = None
++
+ def macosx_sdk_root():
++    """Return the directory of the current macOS SDK.
++
++    If no SDK was explicitly configured, call the compiler to find which
++    include files paths are being searched by default.  Use '/' if the
++    compiler is searching /usr/include (meaning system header files are
++    installed) or use the root of an SDK if that is being searched.
++    (The SDK may be supplied via Xcode or via the Command Line Tools).
++    The SDK paths used by Apple-supplied tool chains depend on the
++    setting of various variables; see the xcrun man page for more info.
+     """
+-    Return the directory of the current OSX SDK,
+-    or '/' if no SDK was specified.
+-    """
++    global MACOS_SDK_ROOT
++
++    # If already called, return cached result.
++    if MACOS_SDK_ROOT:
++        return MACOS_SDK_ROOT
++
+     cflags = sysconfig.get_config_var('CFLAGS')
+     m = re.search(r'-isysroot\s+(\S+)', cflags)
+-    if m is None:
+-        sysroot = '/'
++    if m is not None:
++        MACOS_SDK_ROOT = m.group(1)
+     else:
+-        sysroot = m.group(1)
+-    return sysroot
++        MACOS_SDK_ROOT = '/'
++        cc = sysconfig.get_config_var('CC')
++        tmpfile = '/tmp/setup_sdk_root.%d' % os.getpid()
++        try:
++            os.unlink(tmpfile)
++        except:
++            pass
++        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (cc, tmpfile))
++        in_incdirs = False
++        try:
++            if ret >> 8 == 0:
++                with open(tmpfile) as fp:
++                    for line in fp.readlines():
++                        if line.startswith("#include <...>"):
++                            in_incdirs = True
++                        elif line.startswith("End of search list"):
++                            in_incdirs = False
++                        elif in_incdirs:
++                            line = line.strip()
++                            if line == '/usr/include':
++                                MACOS_SDK_ROOT = '/'
++                            elif line.endswith(".sdk/usr/include"):
++                                MACOS_SDK_ROOT = line[:-12]
++        finally:
++            os.unlink(tmpfile)
++
++    return MACOS_SDK_ROOT
+ 
+ def is_macosx_sdk_path(path):
+     """
+-- 
+2.30.1 (Apple Git-130)
+

plugins/python-build/share/python-build/patches/3.6.15/Python-3.6.15/0009-bpo-27987-pymalloc-align-by-16bytes-on-64bit-platfor.patch

@@ -0,0 +1,43 @@
+From 54dc627769bf112b0181972a52c4b45e4a02da57 Mon Sep 17 00:00:00 2001
+From: Inada Naoki <songofacandy@gmail.com>
+Date: Tue, 14 May 2019 18:51:15 +0900
+Subject: [PATCH 09/10] bpo-27987: pymalloc: align by 16bytes on 64bit platform
+ (GH-12850)
+
+---
+ .../2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst                | 3 +++
+ Objects/obmalloc.c                                          | 6 ++++++
+ 2 files changed, 9 insertions(+)
+ create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst
+
+diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst b/Misc/NEWS.d/next/Core and Builtins/2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst
+new file mode 100644
+index 0000000000..b0f32a5c6c
+--- /dev/null
++++ b/Misc/NEWS.d/next/Core and Builtins/2019-04-16-11-52-21.bpo-27987.n2_DcQ.rst	
+@@ -0,0 +1,3 @@
++pymalloc returns memory blocks aligned by 16 bytes, instead of 8 bytes, on
++64-bit platforms to conform x86-64 ABI. Recent compilers assume this alignment
++more often. Patch by Inada Naoki.
+diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
+index d46d149311..47283354f4 100644
+--- a/Objects/obmalloc.c
++++ b/Objects/obmalloc.c
+@@ -650,8 +650,14 @@ static int running_on_valgrind = -1;
+  *
+  * You shouldn't change this unless you know what you are doing.
+  */
++
++#if SIZEOF_VOID_P > 4
++#define ALIGNMENT              16               /* must be 2^N */
++#define ALIGNMENT_SHIFT         4
++#else
+ #define ALIGNMENT               8               /* must be 2^N */
+ #define ALIGNMENT_SHIFT         3
++#endif
+ 
+ /* Return the number of bytes in size class I, as a uint. */
+ #define INDEX2SIZE(I) (((uint)(I) + 1) << ALIGNMENT_SHIFT)
+-- 
+2.38.4
+

plugins/python-build/share/python-build/patches/3.6.15/Python-3.6.15/0010-bpo-27987-align-PyGC_Head-to-alignof-long-double-GH-.patch

@@ -0,0 +1,40 @@
+From e68ff170dc6764b22886e703f583fb53e90367ef Mon Sep 17 00:00:00 2001
+From: Inada Naoki <songofacandy@gmail.com>
+Date: Sat, 25 May 2019 21:13:33 +0900
+Subject: [PATCH 10/10] bpo-27987: align PyGC_Head to alignof(long double)
+ (GH-13335)
+
+---
+ Include/objimpl.h                                           | 6 +++++-
+ .../2019-05-15-18-28-43.bpo-27987.FaxuLy.rst                | 2 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-05-15-18-28-43.bpo-27987.FaxuLy.rst
+
+diff --git a/Include/objimpl.h b/Include/objimpl.h
+index e7a3696d7a..90d71b87ea 100644
+--- a/Include/objimpl.h
++++ b/Include/objimpl.h
+@@ -255,7 +255,11 @@ typedef union _gc_head {
+         union _gc_head *gc_prev;
+         Py_ssize_t gc_refs;
+     } gc;
+-    double dummy;  /* force worst-case alignment */
++    long double dummy;  /* force worst-case alignment */
++    // malloc returns memory block aligned for any built-in types and
++    // long double is the largest standard C type.
++    // On amd64 linux, long double requires 16 byte alignment.
++    // See bpo-27987 for more discussion.
+ } PyGC_Head;
+ 
+ extern PyGC_Head *_PyGC_generation0;
+diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-05-15-18-28-43.bpo-27987.FaxuLy.rst b/Misc/NEWS.d/next/Core and Builtins/2019-05-15-18-28-43.bpo-27987.FaxuLy.rst
+new file mode 100644
+index 0000000000..97ca37b262
+--- /dev/null
++++ b/Misc/NEWS.d/next/Core and Builtins/2019-05-15-18-28-43.bpo-27987.FaxuLy.rst	
+@@ -0,0 +1,2 @@
++``PyGC_Head`` structure is aligned to ``long double``.  This is needed to
++GC-ed objects are aligned properly.  Patch by Inada Naoki.
+-- 
+2.38.4
+

plugins/python-build/test/pyenv_ext.bats

@@ -89,7 +89,7 @@ install_tmp_fixture() {
 }
 
 resolve_link() {
-  $(type -P greadlink readlink | head -1) "$1"
+  $(type -P greadlink readlink | head -n1) "$1"
 }
 
 run_inline_definition_with_name() {

plugins/python-build/test/test_helper.bash

@@ -133,7 +133,7 @@ assert_output_contains() {
     echo "assert_output_contains needs an argument" >&2
     return 1
   fi
-  echo "$output" | $(type -P ggrep grep | head -1) -F "$expected" >/dev/null || {
+  echo "$output" | $(type -P ggrep grep | head -n1) -F "$expected" >/dev/null || {
     { echo "expected output to contain $expected"
       echo "actual: $output"
     } | flunk

plugins/python-build/test/version.bats

@@ -3,7 +3,7 @@
 load test_helper
 
 bats_bin="${BATS_TEST_DIRNAME}/../bin/python-build"
-static_version="$(grep VERSION "$bats_bin" | head -1 | cut -d'"' -f 2)"
+static_version="$(grep VERSION "$bats_bin" | head -n1 | cut -d'"' -f 2)"
 
 @test "python-build static version" {
   stub git 'echo "ASPLODE" >&2; exit 1'