diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2018-05-16 14:13:08 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2018-05-16 14:18:43 +0200 |
| commit | ed0e36e7b664078c7b7f2c346ea377f7537385f8 (patch) | |
| tree | 7996b5896d9741fcbb6c91f394da5d38b9821a70 /eclass | |
| parent | sys-kernel/gentoo-sources: Linux patch 4.4.132 (diff) | |
| download | gentoo-ed0e36e7b664078c7b7f2c346ea377f7537385f8.tar.gz gentoo-ed0e36e7b664078c7b7f2c346ea377f7537385f8.tar.bz2 gentoo-ed0e36e7b664078c7b7f2c346ea377f7537385f8.zip | |
eclass/autotools.eclass: Use proper arguments to has_version checking for automake in /.
Bug: https://bugs.gentoo.org/655326
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/autotools.eclass | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index ea85e73a8042..2bc70f7b3c00 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -442,10 +442,17 @@ autotools_env_setup() { if [[ ${WANT_AUTOMAKE} == "latest" ]]; then local pv for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do - # has_version respects ROOT, but in this case, we don't want it to, - # thus "ROOT=/" prefix; # Break on first hit to respect _LATEST_AUTOMAKE order. - ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break + local hv_args="" + case ${EAPI:-0} in + 5|6) + hv_args="--host-root" + ;; + 7) + hv_args="-b" + ;; + esac + ROOT=/ has_version ${hv_args} "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break done [[ ${WANT_AUTOMAKE} == "latest" ]] && \ die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE[*]}" |