From dd6a3b2f24fc453f0ff6abe4abd658fa888e1ee1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 15 Nov 2014 07:50:02 +0000 Subject: [PATCH] =?utf8?q?abort=20when=20AUTOTOOLS=5FAUTO=5FDEPEND=20chang?= =?utf8?q?es=20on=20us=20as=20it=20will=20not=20work=20and=20is=20not=20in?= =?utf8?q?tended=20behavior=20#409611=20by=20Micha=C5=82=20G=C3=B3rny?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- eclass/autotools.eclass | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 50c6aa5c53bc..0cb74a50d31a 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.168 2014/11/15 07:11:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.169 2014/11/15 07:50:02 vapier Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -13,6 +13,16 @@ # 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 + # 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 autotools.eclass first! ${__AUTOTOOLS_AUTO_DEPEND} -> ${AUTOTOOLS_AUTO_DEPEND}" + fi +fi + if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then _AUTOTOOLS_ECLASS=1 @@ -107,6 +117,7 @@ RDEPEND="" if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then DEPEND=${AUTOTOOLS_DEPEND} fi +__AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass unset _automake_atom _autoconf_atom -- 2.26.2