From 5d7e4a842eb2f93f3ac98d6a20a85d5e284529dd Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 11 Mar 2024 07:11:40 +0000 Subject: [PATCH] dev-build/automake: Sync with Gentoo It's from Gentoo commit 6a637f808e44c52c460b849e838e7db42de21aea. --- .../automake/automake-1.16.5-r2.ebuild | 3 +- .../dev-build/automake/automake-9999.ebuild | 3 +- .../files/automake-1.16.5-py312.patch | 34 +++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-py312.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r2.ebuild index ce41b47605..d4553e58b6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-1.16.5-r2.ebuild @@ -8,7 +8,7 @@ EAPI=7 # on new automake (major) releases, as well as the dependency in RDEPEND below too. # * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-any-r1 @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch "${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch "${FILESDIR}"/${PN}-1.16.5-parallel-build.patch + "${FILESDIR}"/${PN}-1.16.5-py312.patch "${WORKDIR}"/${PN}-1.16.5-tests-c99.patch ) diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.ebuild index fbae9d59d8..a5d0371f52 100644 --- a/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/automake-9999.ebuild @@ -8,11 +8,12 @@ EAPI=7 # on new automake (major) releases, as well as the dependency in RDEPEND below too. # * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass. -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-any-r1 if [[ ${PV} == 9999 ]] ; then + EGIT_MIN_CLONE_TYPE=single EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" inherit git-r3 else diff --git a/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-py312.patch b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-py312.patch new file mode 100644 index 0000000000..124403f1db --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-build/automake/files/automake-1.16.5-py312.patch @@ -0,0 +1,34 @@ +https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f1112a88d2361eb2ba5cedf49995ac75879059d9 + +From f1112a88d2361eb2ba5cedf49995ac75879059d9 Mon Sep 17 00:00:00 2001 +From: Bogdan +Date: Sun, 28 Jan 2024 18:12:50 -0800 +Subject: [PATCH] test: another check for PEP-3147 induced by Python 3.12.1. + +Fix for more of https://bugs.gnu.org/68119. + +* t/ax/am-test-lib.sh (python_has_pep3147) : +check sys.implementation.cache_tag as well as the (old) +imp.get_tag. For Python 3.12.1. +--- + t/ax/am-test-lib.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh +index fbbb79005..d61fd6662 100644 +--- a/t/ax/am-test-lib.sh ++++ b/t/ax/am-test-lib.sh +@@ -635,6 +635,10 @@ python_has_pep3147 () + am_pep3147_tag=$($PYTHON -c 'import imp; print(imp.get_tag())') \ + || am_pep3147_tag=none + fi ++ if test "$am_pep3147_tag" = "none"; then ++ am_pep3147_tag=$($PYTHON -c 'import sys; print(sys.implementation.cache_tag)') \ ++ || am_pep3147_tag=none ++ fi + test $am_pep3147_tag != none + } + am_pep3147_tag= +-- +2.44.0 +