diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
| commit | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch) | |
| tree | 464c922e949c7e4d5d891fb2cdda5daee5612537 /eclass/autotools.eclass | |
| parent | e68d405c5d712af4387159df07e226217bdda049 (diff) | |
gentoo resync : 16.04.2022
Diffstat (limited to 'eclass/autotools.eclass')
| -rw-r--r-- | eclass/autotools.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 8a44aae417db..c275c83d55c2 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -13,13 +13,13 @@ # Note: We require GNU m4, as does autoconf. So feel free to use any features # from the GNU version of m4 without worrying about other variants (i.e. BSD). -if [[ ${__AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then +if [[ ${_AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then # See if we were included already, but someone changed the value # of AUTOTOOLS_AUTO_DEPEND on us. We could reload the entire # eclass at that point, but that adds overhead, and it's trivial # to re-order inherit in eclasses/ebuilds instead. #409611 - if [[ ${__AUTOTOOLS_AUTO_DEPEND} != ${AUTOTOOLS_AUTO_DEPEND} ]] ; then - die "AUTOTOOLS_AUTO_DEPEND changed value between inherits; please inherit ${ECLASS} first! ${__AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}" + if [[ ${_AUTOTOOLS_AUTO_DEPEND} != ${AUTOTOOLS_AUTO_DEPEND} ]] ; then + die "AUTOTOOLS_AUTO_DEPEND changed value between inherits; please inherit ${ECLASS} first! ${_AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}" fi fi @@ -74,7 +74,7 @@ inherit gnuconfig 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.4:1.16 ) +_LATEST_AUTOMAKE=( 1.16.5:1.16 ) _automake_atom="sys-devel/automake" _autoconf_atom="sys-devel/autoconf" @@ -134,7 +134,7 @@ if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then *) BDEPEND=${AUTOTOOLS_DEPEND} ;; esac fi -__AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass +_AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass unset _automake_atom _autoconf_atom |