From b6ec589aae9e98cbec37acdc9813efc9abf3582b Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 1 Jul 2024 07:14:33 +0000 Subject: [PATCH] eclass/autotools: Sync with Gentoo It's from Gentoo commit 691f40a3f2455e23e27c630b7658dd07428ac44a. --- .../third_party/portage-stable/eclass/autotools.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 1ced771c53..a456e9b9f5 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/autotools.eclass @@ -33,6 +33,7 @@ _AUTOTOOLS_ECLASS=1 [[ ${EAPI} == 6 ]] && inherit eqawarn +GNUCONFIG_AUTO_DEPEND=no inherit gnuconfig libtool # @ECLASS_VARIABLE: WANT_AUTOCONF @@ -164,9 +165,12 @@ fi # @DESCRIPTION: # Contains the combination of requested automake/autoconf/libtool # versions in *DEPEND format. -AUTOTOOLS_DEPEND="${_automake_atom} +AUTOTOOLS_DEPEND=" + ${GNUCONFIG_DEPEND} + ${_automake_atom} ${_autoconf_atom} - ${_libtool_atom}" + ${_libtool_atom} +" RDEPEND="" # @ECLASS_VARIABLE: AUTOTOOLS_AUTO_DEPEND