commit:     91d7d6378c8df8b0a116b8adcffa5268d040d515
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  1 00:03:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 11 20:59:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d7d637

autotools.eclass: use gnuconfig.eclass for finding latest config.{guess, sub}

No need to duplicate logic.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/autotools.eclass | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 04d94d88260..054a31781e7 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -35,7 +35,7 @@ case ${EAPI:-0} in
        *) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
 esac
 
-inherit libtool
+inherit gnuconfig libtool
 
 # @ECLASS-VARIABLE: WANT_AUTOCONF
 # @PRE_INHERIT
@@ -400,15 +400,7 @@ eautoconf() {
 
        # Install config.guess and config.sub which are required by many macros
        # in autoconf >=2.70.
-       local _gnuconfig
-       case ${EAPI:-0} in
-               0|1|2|3|4|5|6)
-                       _gnuconfig="${EPREFIX}/usr/share/gnuconfig"
-               ;;
-               *)
-                       _gnuconfig="${BROOT}/usr/share/gnuconfig"
-               ;;
-       esac
+       local _gnuconfig=$(gnuconfig_findnewest)
        cp "${_gnuconfig}"/config.{guess,sub} . || die
 
        autotools_run_tool --at-m4flags autoconf "$@"

Reply via email to