eclass/autotools: Sync with Gentoo

It's from Gentoo commit 221159b1ca716e208abcd9fc2e3d7efad0db9446.
This commit is contained in:
Flatcar Buildbot 2024-01-29 07:12:26 +00:00 committed by Krzesimir Nowak
parent 06694caa52
commit 8ff7f4b0a5

View File

@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: autotools.eclass
@ -95,8 +95,8 @@ _LATEST_AUTOCONF=( 2.72-r1:2.72 2.71-r6:2.71 )
# WANT value by using a colon: <PV>:<WANT_AUTOMAKE>
_LATEST_AUTOMAKE=( 1.16.5:1.16 )
_automake_atom="sys-devel/automake"
_autoconf_atom="sys-devel/autoconf"
_automake_atom="dev-build/automake"
_autoconf_atom="dev-build/autoconf"
if [[ -n ${WANT_AUTOMAKE} ]] ; then
case ${WANT_AUTOMAKE} in
none)
@ -105,12 +105,12 @@ if [[ -n ${WANT_AUTOMAKE} ]] ; then
# the autoreconf tool, so this requirement is correct, bug #401605.
;;
latest)
printf -v _automake_atom_tmp '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }
printf -v _automake_atom_tmp '>=dev-build/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }
_automake_atom="|| ( ${_automake_atom_tmp} )"
unset _automake_atom_tmp
;;
*)
_automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*"
_automake_atom="=dev-build/automake-${WANT_AUTOMAKE}*"
;;
esac
export WANT_AUTOMAKE
@ -126,19 +126,19 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then
_autoconf_atom=""
;;
2.1)
_autoconf_atom=">=sys-devel/autoconf-2.13-r7:2.1"
_autoconf_atom=">=dev-build/autoconf-2.13-r7:2.1"
;;
2.5)
_autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71"
_autoconf_atom=">=dev-build/autoconf-2.71-r6:2.71"
;;
2.69)
_autoconf_atom=">=sys-devel/autoconf-2.69-r9:2.69"
_autoconf_atom=">=dev-build/autoconf-2.69-r9:2.69"
;;
2.71)
_autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71"
_autoconf_atom=">=dev-build/autoconf-2.71-r6:2.71"
;;
latest)
printf -v _autoconf_atom_tmp '>=sys-devel/autoconf-%s:%s ' ${_LATEST_AUTOCONF[@]/:/ }
printf -v _autoconf_atom_tmp '>=dev-build/autoconf-%s:%s ' ${_LATEST_AUTOCONF[@]/:/ }
_autoconf_atom="|| ( ${_autoconf_atom_tmp} )"
unset _autoconf_atom_tmp
;;
@ -149,7 +149,7 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then
export WANT_AUTOCONF
fi
_libtool_atom=">=sys-devel/libtool-2.4.7"
_libtool_atom=">=dev-build/libtool-2.4.7"
if [[ -n ${WANT_LIBTOOL} ]] ; then
case ${WANT_LIBTOOL} in
none) _libtool_atom="" ;;
@ -570,7 +570,7 @@ autotools_env_setup() {
hv_args="-b"
;;
esac
has_version ${hv_args} "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
has_version ${hv_args} "=dev-build/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break
done
# During bootstrap in prefix there might be no automake merged yet
@ -599,7 +599,7 @@ autotools_env_setup() {
hv_args="-b"
;;
esac
has_version ${hv_args} "=sys-devel/autoconf-${pv}*" && export WANT_AUTOCONF="${pv}" && break
has_version ${hv_args} "=dev-build/autoconf-${pv}*" && export WANT_AUTOCONF="${pv}" && break
done
# During bootstrap in prefix there might be no autoconf merged yet