From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass
Date: Wed, 21 Mar 2012 21:51:32 +0000 (UTC) [thread overview]
Message-ID: <20120321215132.2150C2004B@flycatcher.gentoo.org> (raw)
vapier 12/03/21 21:51:32
Modified: autotools.eclass
Log:
restore functionality lost in previous commit
Revision Changes Path
1.128 eclass/autotools.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.128&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.128&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.127&r2=1.128
Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- autotools.eclass 21 Mar 2012 17:12:01 -0000 1.127
+++ autotools.eclass 21 Mar 2012 21:51:32 -0000 1.128
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.127 2012/03/21 17:12:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.128 2012/03/21 21:51:32 vapier Exp $
# @ECLASS: autotools.eclass
# @MAINTAINER:
@@ -16,7 +16,7 @@
if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then
___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank"
-inherit eutils libtool versionator
+inherit eutils libtool
# @ECLASS-VARIABLE: WANT_AUTOCONF
# @DESCRIPTION:
@@ -37,11 +37,13 @@
# @INTERNAL
# @DESCRIPTION:
# CONSTANT!
-# The latest major-minor version/slot of automake available on each arch. #312315
+# The latest major version/slot of automake available on each arch. #312315
# If a newer slot is stable on any arch, and is NOT reflected in this list,
# then circular dependencies may arise during emerge @system bootstraps.
# Do NOT change this variable in your ebuilds!
-_LATEST_AUTOMAKE=1.11.1
+# 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.11.1:1.11 )
_automake_atom="sys-devel/automake"
_autoconf_atom="sys-devel/autoconf"
@@ -51,14 +53,14 @@
# if you change the "latest" version here, change also autotools_run_tool
# this MUST reflect the latest stable major version for each arch!
latest)
- if [[ ${EAPI:-0} != 0 ]]; then
- _automake_atom=">=sys-devel/automake-${_LATEST_AUTOMAKE}:$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})"
+ # Use SLOT deps if we can. For EAPI=0, we get pretty close.
+ if [[ ${EAPI:-0} != 0 ]] ; then
+ _automake_atom="|| ( `printf '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )"
else
- _automake_atom=">=sys-devel/automake-${_LATEST_AUTOMAKE} =sys-devel/automake-$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})*"
+ _automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )"
fi
;;
- *)
- _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
+ *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
esac
export WANT_AUTOMAKE
fi
@@ -351,10 +353,12 @@
# We do the "latest" → version switch here because it solves
# possible order problems, see bug #270010 as an example.
if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
- # has_version respects ROOT, but in this case, we don't want it to,
- # thus "ROOT=/" prefix:
- ROOT=/ has_version "=sys-devel/automake-$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})*" && export WANT_AUTOMAKE="$(get_version_component_range 1-2 ${_LATEST_AUTOMAKE})"
-
+ 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:
+ ROOT=/ has_version "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}"
+ done
[[ ${WANT_AUTOMAKE} == "latest" ]] && \
die "Cannot find the latest automake! Tried ${_LATEST_AUTOMAKE}"
fi
next reply other threads:[~2012-03-21 21:51 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 21:51 Mike Frysinger (vapier) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-17 9:36 [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass Mike Frysinger (vapier)
2015-06-03 4:06 Mike Frysinger (vapier)
2015-05-20 5:57 Mike Frysinger (vapier)
2015-03-19 19:27 Mike Frysinger (vapier)
2014-11-21 9:17 Mike Frysinger (vapier)
2014-11-15 7:50 Mike Frysinger (vapier)
2014-11-15 7:11 Mike Frysinger (vapier)
2014-11-15 5:40 Mike Frysinger (vapier)
2014-11-15 5:10 Mike Frysinger (vapier)
2014-11-14 1:31 Mike Frysinger (vapier)
2014-11-13 17:14 Mike Frysinger (vapier)
2014-08-12 12:15 Mike Frysinger (vapier)
2014-02-18 3:57 Mike Frysinger (vapier)
2013-12-30 8:19 Mike Frysinger (vapier)
2013-11-30 6:00 Mike Frysinger (vapier)
2013-04-28 21:55 Mike Frysinger (vapier)
2013-04-28 16:45 Mike Frysinger (vapier)
2013-04-23 19:16 Mike Frysinger (vapier)
2013-04-15 21:46 Mike Frysinger (vapier)
2013-01-28 4:13 Mike Frysinger (vapier)
2012-06-08 4:55 Mike Frysinger (vapier)
2012-06-07 6:00 Mike Frysinger (vapier)
2012-06-07 4:50 Mike Frysinger (vapier)
2012-05-24 1:13 Mike Frysinger (vapier)
2012-05-21 18:13 Mike Frysinger (vapier)
2012-05-21 17:53 Mike Frysinger (vapier)
2012-05-21 17:40 Mike Frysinger (vapier)
2012-05-20 13:01 Mike Frysinger (vapier)
2012-05-20 12:58 Mike Frysinger (vapier)
2012-05-20 12:55 Mike Frysinger (vapier)
2012-05-20 12:38 Mike Frysinger (vapier)
2012-05-20 12:31 Mike Frysinger (vapier)
2012-05-20 10:39 Mike Frysinger (vapier)
2012-05-20 10:32 Mike Frysinger (vapier)
2012-05-20 10:26 Mike Frysinger (vapier)
2012-03-22 19:16 Mike Frysinger (vapier)
2012-03-22 15:14 Mike Frysinger (vapier)
2012-03-21 8:19 Samuli Suominen (ssuominen)
2012-03-21 3:27 Mike Frysinger (vapier)
2012-02-13 17:26 Mike Frysinger (vapier)
2012-02-13 17:21 Mike Frysinger (vapier)
2012-01-06 21:06 Mike Frysinger (vapier)
2012-01-04 22:00 Mike Frysinger (vapier)
2011-12-14 20:46 Mike Frysinger (vapier)
2011-12-14 19:15 Mike Frysinger (vapier)
2011-12-14 18:33 Mike Frysinger (vapier)
2011-12-13 21:57 Mike Frysinger (vapier)
2011-12-13 21:44 Mike Frysinger (vapier)
2011-12-13 21:27 Mike Frysinger (vapier)
2011-10-05 13:44 Mike Frysinger (vapier)
2011-09-23 4:14 Mike Frysinger (vapier)
2011-09-23 4:14 Mike Frysinger (vapier)
2011-08-22 19:39 Mike Frysinger (vapier)
2011-08-22 18:22 Mike Frysinger (vapier)
2011-08-07 22:53 Mike Frysinger (vapier)
2011-05-16 3:44 Mike Frysinger (vapier)
2011-04-06 3:52 Diego Petteno (flameeyes)
2010-07-06 18:55 Mike Frysinger (vapier)
2010-05-23 22:52 Mike Frysinger (vapier)
2010-04-01 21:42 Robin H. Johnson (robbat2)
2010-04-01 10:12 Diego Petteno (flameeyes)
2010-03-31 2:11 Robin H. Johnson (robbat2)
2010-03-07 17:43 Mike Frysinger (vapier)
2010-03-07 17:42 Mike Frysinger (vapier)
2010-02-08 11:04 Samuli Suominen (ssuominen)
2010-01-17 1:09 Mike Frysinger (vapier)
2010-01-15 3:19 Mike Frysinger (vapier)
2010-01-10 18:39 Tomas Chvatal (scarabeus)
2009-12-04 9:11 Mike Frysinger (vapier)
2009-05-18 11:24 Diego Petteno (flameeyes)
2009-05-04 22:27 Mike Frysinger (vapier)
2009-04-12 7:38 Mike Frysinger (vapier)
2009-04-04 17:45 Fabian Groffen (grobian)
2009-01-04 16:54 Mike Frysinger (vapier)
2008-09-26 16:21 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2008-07-31 20:45 Jeremy Olexa (darkside)
2008-07-31 19:54 Samuli Suominen (drac)
2008-07-31 19:13 Jeremy Olexa (darkside)
2008-06-09 9:09 Mike Frysinger (vapier)
2008-06-01 1:43 Mike Frysinger (vapier)
2008-04-24 3:15 Mike Frysinger (vapier)
2008-04-22 22:38 Mike Frysinger (vapier)
2008-03-31 14:19 Mike Frysinger (vapier)
2008-02-23 2:21 Mike Frysinger (vapier)
2008-01-25 22:45 Diego Petteno (flameeyes)
2008-01-13 18:41 Diego Petteno (flameeyes)
2008-01-07 2:54 Mike Frysinger (vapier)
2007-09-18 13:25 Mike Frysinger (vapier)
2007-09-17 23:15 Mike Frysinger (vapier)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120321215132.2150C2004B@flycatcher.gentoo.org \
--to=vapier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox