From ee9520eeb703d99b26b513d46d800fa52431f8e6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 10 Mar 2007 13:40:51 +0000 Subject: [PATCH] only try to unpack the D tarball when USE=d #170230 --- eclass/toolchain.eclass | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index d5a6d9a3ae0c..df1dd82b225d 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.330 2007/03/04 21:03:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.331 2007/03/10 13:40:51 vapier Exp $ # # Maintainer: Toolchain Ninjas @@ -1865,19 +1865,17 @@ gcc_quick_unpack() { fi fi - if [[ -n ${D_VER} ]] ; then + if [[ -n ${D_VER} ]] && use d ; then pushd "${S}"/gcc > /dev/null unpack gdc-${D_VER}-src.tar.bz2 cd .. - if use d ; then - ebegin "Adding support for the D language" - ./gcc/d/setup-gcc.sh >& "${T}"/dgcc.log - if ! eend $? ; then - eerror "The D gcc package failed to apply" - eerror "Please include this log file when posting a bug report:" - eerror " ${T}/dgcc.log" - die "failed to include the D language" - fi + ebegin "Adding support for the D language" + ./gcc/d/setup-gcc.sh >& "${T}"/dgcc.log + if ! eend $? ; then + eerror "The D gcc package failed to apply" + eerror "Please include this log file when posting a bug report:" + eerror " ${T}/dgcc.log" + die "failed to include the D language" fi popd > /dev/null fi -- 2.26.2