From cc2a8a76fc11cbb7e0a274392115561785b69885 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 5 Jun 2023 07:12:45 +0000 Subject: [PATCH] eclass/autotools: Sync with Gentoo It's from Gentoo commit 0e74da3a3d3fd1e90fb779e7ce3a1147ce3d5300. --- .../src/third_party/portage-stable/eclass/autotools.eclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass index 91046b9f82..77124e098a 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass @@ -389,7 +389,6 @@ eautoconf() { die "No configure.{ac,in} present!" fi - if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then case ${EAPI} in 6|7) @@ -400,7 +399,7 @@ eautoconf() { *) # Move configure file to the new location only on newer EAPIs to ensure # checks are done rather than retroactively breaking ebuilds. - eqawarn "Moving configure.in to configure.ac (bug #426262)" + einfo "Moving configure.in to configure.ac (bug #426262)" mv configure.{in,ac} || die ;; esac @@ -560,7 +559,7 @@ autotools_run_tool() { shift done - if [[ ${EBUILD_PHASE_FUNC} != "src_unpack" && ${EBUILD_PHASE_FUNC} != "src_prepare" ]] ; then + if [[ ${EBUILD_PHASE_FUNC} != "src_prepare" ]] ; then eqawarn "Running '${1}' in ${EBUILD_PHASE_FUNC} phase" fi