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 7248D13829C for ; Thu, 2 Jun 2016 15:56:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4ACA421C04E; Thu, 2 Jun 2016 15:56:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57D8B21C04E for ; Thu, 2 Jun 2016 15:56:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1C12340E86 for ; Thu, 2 Jun 2016 15:56:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36AA617B4 for ; Thu, 2 Jun 2016 15:56:42 +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: <1464881215.0bdbb5fb2d15cd433a8a7d0176ae3c5a3a957373.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: 0bdbb5fb2d15cd433a8a7d0176ae3c5a3a957373 X-VCS-Branch: master Date: Thu, 2 Jun 2016 15:56:42 +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: bc544369-cbea-48d0-b3b5-136077613301 X-Archives-Hash: 87f826b1a5a71c7acd922438bf6944df commit: 0bdbb5fb2d15cd433a8a7d0176ae3c5a3a957373 Author: Mike Frysinger gentoo org> AuthorDate: Thu Jun 2 15:26:55 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Thu Jun 2 15:26:55 2016 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=0bdbb5fb crossdev: make multilib eclass loading/parsing more robust Be a bit more proactive in detecting errors so we don't hit another infinite loop. URL: https://bugs.gentoo.org/531044 Reported-by: Ulrar gmail.com> Reported-by: Samuel Loewen gmail.com> crossdev | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/crossdev b/crossdev index 686b906..5cb319c 100755 --- a/crossdev +++ b/crossdev @@ -739,7 +739,7 @@ if [[ -e ${d}/env ]] ; then fi # parse multilib settings until profiles are sane -multilib_env() { +load_multilib_env() { local var=$1 eval $( # see what target to parse @@ -764,7 +764,10 @@ multilib_env() { else single_abi=false fi - multilib_env + if ! multilib_env ; then + echo "die 'could not load multilib settings for ${var}'" + exit 1 + fi ${single_abi} && MULTILIB_ABIS=${DEFAULT_ABI} # output the desired env @@ -792,10 +795,10 @@ multilib_env() { ) } # Load settings for the host. -MULTILIB_ABIS=${HOST_ABI} multilib_env HCHOST +MULTILIB_ABIS=${HOST_ABI} load_multilib_env HCHOST HOST_ABI=${_MULTILIB_ABIS} # Load settings for the target. -multilib_env CTARGET +load_multilib_env CTARGET DEFAULT_ABI=${MULTILIB_ABIS%% *} if [[ -z ${MULTILIB_USE} ]] ; then