From b5047c710870aba781a2d5f4d95fe4b6f7e59ae9 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Thu, 3 Dec 2020 00:00:00 +0000 Subject: [PATCH 1/2] autotools.eclass: eautoconf(): Install config.guess and config.sub. Bug: https://bugs.gentoo.org/757996 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- eclass/autotools.eclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 625abd0e9d1..adeef7b17be 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -357,6 +357,18 @@ eautoconf() { eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." fi + # Install config.guess and config.sub which are required by many macros in Autoconf >=2.70. + case ${EAPI:-0} in + 0|1|2|3|4|5|6) + cp "${EPREFIX}/usr/share/gnuconfig/config.guess" . || die + cp "${EPREFIX}/usr/share/gnuconfig/config.sub" . || die + ;; + *) + cp "${BROOT}/usr/share/gnuconfig/config.guess" . || die + cp "${BROOT}/usr/share/gnuconfig/config.sub" . || die + ;; + esac + autotools_run_tool --at-m4flags autoconf "$@" } -- 2.29.2 From f151ddc50d8dabe25b0a42dd6bd402e3674e27dd Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Thu, 3 Dec 2020 01:00:00 +0000 Subject: [PATCH 2/2] sys-devel/autoconf: Use config.guess and config.sub from sys-devel/gnuconfig. Make config.guess and config.sub symbolic links pointing to files provided by sys-devel/gnuconfig. Bug: https://bugs.gentoo.org/757996 Signed-off-by: Arfrever Frehtes Taifersar Arahesis --- sys-devel/autoconf/autoconf-2.70_beta4.ebuild | 14 ++++++++++++-- sys-devel/autoconf/autoconf-9999.ebuild | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.70_beta4.ebuild b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild index c11bf9d76d5..3f62766dc5d 100644 --- a/sys-devel/autoconf/autoconf-2.70_beta4.ebuild +++ b/sys-devel/autoconf/autoconf-2.70_beta4.ebuild @@ -28,8 +28,9 @@ IUSE="emacs" BDEPEND=">=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6" RDEPEND="${BDEPEND} - !~sys-devel/${P}:2.5 - ~sys-devel/autoconf-wrapper-14_pre3" + ~sys-devel/autoconf-wrapper-14_pre3 + sys-devel/gnuconfig + !~sys-devel/${P}:2.5" [[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" PDEPEND="emacs? ( app-emacs/autoconf-mode )" @@ -48,3 +49,12 @@ src_prepare() { # We already have an up to date autoconf.info page at this point. touch -r doc/{old_,}autoconf.texi || die } + +src_install() { + default + + local f + for f in config.guess config.sub; do + ln -fs ../../gnuconfig/${f} "${ED}"/usr/share/autoconf-*/build-aux/${f} || die + done +} diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild index 155a08e8f7a..58895dec2f9 100644 --- a/sys-devel/autoconf/autoconf-9999.ebuild +++ b/sys-devel/autoconf/autoconf-9999.ebuild @@ -24,8 +24,9 @@ IUSE="emacs" BDEPEND=">=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6" RDEPEND="${BDEPEND} - !~sys-devel/${P}:2.5 - >=sys-devel/autoconf-wrapper-13" + ~sys-devel/autoconf-wrapper-14_pre3 + sys-devel/gnuconfig + !~sys-devel/${P}:2.5" [[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" PDEPEND="emacs? ( app-emacs/autoconf-mode )" @@ -41,3 +42,12 @@ src_prepare() { toolchain-autoconf_src_prepare } + +src_install() { + default + + local f + for f in config.guess config.sub; do + ln -fs ../../gnuconfig/${f} "${ED}"/usr/share/autoconf-*/build-aux/${f} || die + done +} -- 2.29.2