From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C5D2E58973 for ; Sat, 16 Jan 2016 06:38:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1A4221C001; Sat, 16 Jan 2016 06:38:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60E8821C001 for ; Sat, 16 Jan 2016 06:38:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F090340B3B for ; Sat, 16 Jan 2016 06:38:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5918FB5 for ; Sat, 16 Jan 2016 06:38:48 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1445833978.769d97b3d6c956ea54c2ec33268615e3ffa08757.vapier@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: / X-VCS-Repository: proj/crossdev X-VCS-Files: crossdev X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 769d97b3d6c956ea54c2ec33268615e3ffa08757 X-VCS-Branch: master Date: Sat, 16 Jan 2016 06:38:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ecf2cf1a-7545-4f35-ad41-6b8e198b33ee X-Archives-Hash: 6d9eb88000804c356c294753f3a1e2ca commit: 769d97b3d6c956ea54c2ec33268615e3ffa08757 Author: Bertrand Jacquin jacquin bzh> AuthorDate: Sun Oct 25 18:33:19 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Oct 26 04:32:58 2015 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=769d97b3 crossdev: source only once user env settings When /etc/portage/crossdev/${CTARGET} exist, the output looks like: * Restoring generic user env settings * Restoring generic user env settings * Restoring generic user env settings * Restoring generic user env settings * Restoring generic user env settings * Restoring generic user env settings * Restoring generic user env settings * Restoring generic user env settings * Restoring generic user env settings * Restoring generic user env settings Signed-off-by: Bertrand Jacquin jacquin.bzh> Signed-off-by: Mike Frysinger gentoo.org> crossdev | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crossdev b/crossdev index 74fd390..29bea33 100755 --- a/crossdev +++ b/crossdev @@ -718,18 +718,18 @@ if [[ ${HCHOST} == "${CTARGET}" ]] ; then fi # grab user settings +d="${CONFIGROOT}/crossdev/${CTARGET}" for v in MULTILIB_ABIS USE BVER GVER KVER LVER STAGE CFLAGS LDFLAGS ASFLAGS ; do - d="${CONFIGROOT}/crossdev/${CTARGET}" if [[ -e ${d}/${v} ]] ; then # yes, quotes are needed in this instance (export $var="...") export ${v}="$(<"${d}"/${v})" einfo "Restoring user setting '${v}' to '${!v}'" fi - if [[ -e ${d}/env ]] ; then - einfo "Restoring generic user env settings" - source "${d}"/env - fi done +if [[ -e ${d}/env ]] ; then + einfo "Restoring generic user env settings" + source "${d}"/env +fi # parse multilib settings until profiles are sane multilib_env() {