From 03b284754711a229f903f34d9cafaaaa04311e4c Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Wed, 13 Oct 2021 11:26:57 +0200 Subject: [PATCH] automake: update to 1.16.5 and add a patch to restore previous am_cv_python_pythondir and am_cv_python_pyexecdir behaviour --- srcpkgs/automake/patches/python-m4.patch | 23 +++++++++++++++++++++++ srcpkgs/automake/template | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/automake/patches/python-m4.patch diff --git a/srcpkgs/automake/patches/python-m4.patch b/srcpkgs/automake/patches/python-m4.patch new file mode 100644 index 000000000000..f5099a255e61 --- /dev/null +++ b/srcpkgs/automake/patches/python-m4.patch @@ -0,0 +1,23 @@ +upstream bug report: +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51225 + +--- a/m4/python.m4 2021-10-04 04:51:12.000000000 +0200 ++++ b/m4/python.m4 2021-10-15 08:38:08.575081215 +0200 +@@ -263,7 +263,7 @@ + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"` ++ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,${PYTHON_PREFIX},"` + ;; + *) + case $am_py_prefix in +@@ -305,7 +305,7 @@ + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"` ++ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,${PYTHON_EXEC_PREFIX},"` + ;; + *) + case $am_py_exec_prefix in diff --git a/srcpkgs/automake/template b/srcpkgs/automake/template index 8cfdccb2b91a..c6e0657bfe9e 100644 --- a/srcpkgs/automake/template +++ b/srcpkgs/automake/template @@ -1,7 +1,7 @@ # Template file for 'automake' # NOTE: also update common/environment/configure/automake when updating! pkgname=automake -version=1.16.4 +version=1.16.5 revision=1 build_style=gnu-configure make_check_args="${makejobs}" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.gnu.org/software/automake" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=80facc09885a57e6d49d06972c0ae1089c5fa8f4d4c7cfe5baea58e5085f136d +checksum=f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469 pre_check() { # taken from http://www.linuxfromscratch.org/lfs/view/development/chapter06/automake.html