| 1 |
commit: 5d779308a4b2ef52dd9c0641e891b1eac4054b2b |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 26 17:51:09 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 26 17:51:09 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d779308 |
| 7 |
|
| 8 |
autotools.eclass: Adjust and clarify _LATEST_AUTOMAKE order |
| 9 |
|
| 10 |
eclass/autotools.eclass | 19 ++++++++++++------- |
| 11 |
1 file changed, 12 insertions(+), 7 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass |
| 14 |
index 97664428858..3c55a5c464a 100644 |
| 15 |
--- a/eclass/autotools.eclass |
| 16 |
+++ b/eclass/autotools.eclass |
| 17 |
@@ -46,16 +46,20 @@ inherit libtool |
| 18 |
# @INTERNAL |
| 19 |
# @DESCRIPTION: |
| 20 |
# CONSTANT! |
| 21 |
-# The latest major version/slot of automake available on each arch. #312315 |
| 22 |
-# We should list both the latest stable, and the latest unstable. #465732 |
| 23 |
-# This way the stable builds will still work, but the unstable are allowed |
| 24 |
-# to build & test things for us ahead of time (if they have it installed). |
| 25 |
+# The latest major unstable and stable version/slot of automake available |
| 26 |
+# on each arch. |
| 27 |
+# List latest unstable version first to boost testing adoption rate because |
| 28 |
+# most package manager dependency resolver will pick the first suitable |
| 29 |
+# version. |
| 30 |
# If a newer slot is stable on any arch, and is NOT reflected in this list, |
| 31 |
# then circular dependencies may arise during emerge @system bootstraps. |
| 32 |
+# |
| 33 |
+# See bug 312315 and 465732 for further information and context. |
| 34 |
+# |
| 35 |
# Do NOT change this variable in your ebuilds! |
| 36 |
# If you want to force a newer minor version, you can specify the correct |
| 37 |
# WANT value by using a colon: <PV>:<WANT_AUTOMAKE> |
| 38 |
-_LATEST_AUTOMAKE=( 1.15.1:1.15 1.16:1.16 ) |
| 39 |
+_LATEST_AUTOMAKE=( 1.16:1.16 1.15.1:1.15 ) |
| 40 |
|
| 41 |
_automake_atom="sys-devel/automake" |
| 42 |
_autoconf_atom="sys-devel/autoconf" |
| 43 |
@@ -439,8 +443,9 @@ autotools_env_setup() { |
| 44 |
local pv |
| 45 |
for pv in ${_LATEST_AUTOMAKE[@]/#*:} ; do |
| 46 |
# has_version respects ROOT, but in this case, we don't want it to, |
| 47 |
- # thus "ROOT=/" prefix: |
| 48 |
- ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" |
| 49 |
+ # thus "ROOT=/" prefix; |
| 50 |
+ # Break on first hit to respect _LATEST_AUTOMAKE order. |
| 51 |
+ ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break |
| 52 |
done |
| 53 |
[[ ${WANT_AUTOMAKE} == "latest" ]] && \ |
| 54 |
die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE[*]}" |
Archives