diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
| commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
| tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /eclass/autotools.eclass | |
| parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) | |
gentoo resync : 22.01.2021
Diffstat (limited to 'eclass/autotools.eclass')
| -rw-r--r-- | eclass/autotools.eclass | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index d7ce23bfdf35..08c72cd77953 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: autotools.eclass @@ -54,6 +54,8 @@ inherit libtool # CONSTANT! # The latest major unstable and stable version/slot of automake available # on each arch. +# Only add unstable version if it is in a different slot than latest stable +# version. # List latest unstable version first to boost testing adoption rate because # most package manager dependency resolver will pick the first suitable # version. @@ -65,7 +67,7 @@ inherit libtool # Do NOT change this variable in your ebuilds! # If you want to force a newer minor version, you can specify the correct # WANT value by using a colon: <PV>:<WANT_AUTOMAKE> -_LATEST_AUTOMAKE=( 1.16.1:1.16 1.15.1:1.15 ) +_LATEST_AUTOMAKE=( 1.16.2-r1:1.16 ) _automake_atom="sys-devel/automake" _autoconf_atom="sys-devel/autoconf" @@ -136,6 +138,12 @@ unset _automake_atom _autoconf_atom # Additional options to pass to automake during # eautoreconf call. +# @ECLASS-VARIABLE: AT_NOEAUTOHEADER +# @DEFAULT_UNSET +# @DESCRIPTION: +# Don't run eautoheader command if set to 'yes'; only used to work around +# packages that don't want their headers being modified. + # @ECLASS-VARIABLE: AT_NOEAUTOMAKE # @DEFAULT_UNSET # @DESCRIPTION: @@ -236,7 +244,7 @@ eautoreconf() { else eautoconf --force fi - eautoheader + [[ ${AT_NOEAUTOHEADER} != "yes" ]] && eautoheader [[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then @@ -359,16 +367,16 @@ eautoconf() { # Install config.guess and config.sub which are required by many macros # in Autoconf >=2.70. - local gnuconfig + local _gnuconfig case ${EAPI:-0} in 0|1|2|3|4|5|6) - gnuconfig="${EPREFIX}/usr/share/gnuconfig" + _gnuconfig="${EPREFIX}/usr/share/gnuconfig" ;; *) - gnuconfig="${BROOT}/usr/share/gnuconfig" + _gnuconfig="${BROOT}/usr/share/gnuconfig" ;; esac - cp "${gnuconfig}"/config.{guess,sub} . || die + cp "${_gnuconfig}"/config.{guess,sub} . || die autotools_run_tool --at-m4flags autoconf "$@" } |