summaryrefslogtreecommitdiffstats
path: root/source/d/automake/automake.python.3.10.diff
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-10-15 20:47:13 +0000
committer Eric Hameleers <alien@slackware.com>2021-10-16 09:04:20 +0200
commitaadd8167b60785f4ee2cc4368e1faa018900a387 (patch)
treef91b6de5d9fba92a6f44420557f5a08a09123b91 /source/d/automake/automake.python.3.10.diff
parentbd6ff8d439f656e50de1d6f7d43464bd5dcc3bab (diff)
downloadcurrent-aadd8167b60785f4ee2cc4368e1faa018900a387.tar.gz
current-aadd8167b60785f4ee2cc4368e1faa018900a387.tar.xz
Fri Oct 15 20:47:13 UTC 202120211015204713
ap/htop-3.1.1-x86_64-1.txz: Upgraded. d/automake-1.16.2-noarch-4.txz: Rebuilt. The GNU toolchain is making it increasingly impossible to use our usual "${ARCH}-slackware-linux" host, erroring out with a host mismatch on at least GTK+2. So, we'll drop back to this version of automake for now, with a fix applied for detecting Python 3.10. More than likely we'll be changing the host to "${ARCH}-slackware-linux-gnu" to satisfy upstream, but that will have to wait for the next devel cycle. d/llvm-13.0.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/rust-1.55.0-x86_64-2.txz: Rebuilt. Recompiled against llvm-13.0.0. kde/kdevelop-5.6.2-x86_64-6.txz: Rebuilt. Recompiled against llvm-13.0.0. kde/plasma-workspace-5.23.0-x86_64-2.txz: Rebuilt. Applied upstream patch: [PATCH] sddm-theme: fix missing password field on "Other" page. Thanks to USUARIONUEVO and LuckyCyborg. l/libclc-13.0.0-x86_64-1.txz: Upgraded. Recompiled against llvm-13.0.0. l/python-pillow-8.4.0-x86_64-1.txz: Upgraded. l/qt5-5.15.3_20211013_5c7c3af5-x86_64-1.txz: Upgraded. Upgraded to latest git (might as well) and compiled against llvm-13.0.0. l/spirv-llvm-translator-20210920_098034ea-x86_64-1.txz: Upgraded. Recompiled against llvm-13.0.0. x/mesa-21.2.4-x86_64-1.txz: Upgraded. Compiled against llvm-13.0.0. xap/pidgin-2.14.8-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/d/automake/automake.python.3.10.diff')
-rw-r--r--source/d/automake/automake.python.3.10.diff22
1 files changed, 22 insertions, 0 deletions
diff --git a/source/d/automake/automake.python.3.10.diff b/source/d/automake/automake.python.3.10.diff
new file mode 100644
index 000000000..02dd7348f
--- /dev/null
+++ b/source/d/automake/automake.python.3.10.diff
@@ -0,0 +1,22 @@
+--- ./m4/python.m4.orig 2020-01-01 13:43:28.000000000 -0600
++++ ./m4/python.m4 2021-10-15 11:40:40.523668203 -0500
+@@ -86,12 +86,14 @@
+ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
+ else
+
+- dnl Query Python for its version number. Getting [:3] seems to be
+- dnl the best way to do this; it's what "site.py" does in the standard
+- dnl library.
+-
++ dnl Query Python for its version number. Although site.py simply uses
++ dnl sys.version[:3], printing that failed with Python 3.10, since the
++ dnl trailing zero was eliminated. So now we output just the major
++ dnl and minor version numbers, as numbers. Apparently the tertiary
++ dnl version is not of interest.
++ dnl
+ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
+- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
++ [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
+ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
+
+ dnl Use the values of $prefix and $exec_prefix for the corresponding