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 C2BBD138010 for ; Tue, 2 Apr 2013 21:43:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C7F4E0E6F; Tue, 2 Apr 2013 21:42:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FB19E0E40 for ; Tue, 2 Apr 2013 21:42:40 +0000 (UTC) Received: from pomiocik.lan (87-205-60-160.adsl.inetia.pl [87.205.60.160]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 93D7433DC34; Tue, 2 Apr 2013 21:42:38 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 2/2] Use MULTILIB_ABI in header wrapping code. Date: Tue, 2 Apr 2013 23:43:32 +0200 Message-Id: <1364939012-29714-2-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <20130402234242.5c97d709@pomiocik.lan> References: <20130402234242.5c97d709@pomiocik.lan> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: 0dbbb2f0-814c-4886-ac05-520d7e3724f3 X-Archives-Hash: 334ccb0690407faf2784343c56e6154d --- gx86/eclass/autotools-multilib.eclass | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/gx86/eclass/autotools-multilib.eclass b/gx86/eclass/autotools-multilib.eclass index 5ecbd2f..55d32d7 100644 --- a/gx86/eclass/autotools-multilib.eclass +++ b/gx86/eclass/autotools-multilib.eclass @@ -102,33 +102,20 @@ _autotools-multilib_wrap_headers() { #if defined(__x86_64__) /* amd64 */ # if defined(__ILP32__) /* x32 ABI */ -# error "abi_x86_x32 not supported by the package." +# error "x86_x32 not supported by the package." # else /* 64-bit ABI */ -# error "abi_x86_64 not supported by the package." +# error "x86_64 not supported by the package." # endif #elif defined(__i386__) /* plain x86 */ -# error "abi_x86_32 not supported by the package." +# error "x86_32 not supported by the package." #else # error "No ABI matched, please report a bug to bugs.gentoo.org" #endif _EOF_ fi - # XXX: get abi_* directly - local abi_flag - case "${ABI}" in - amd64) - abi_flag=abi_x86_64;; - x86) - abi_flag=abi_x86_32;; - x32) - abi_flag=abi_x86_x32;; - *) - die "Header wrapping for ${ABI} not supported yet";; - esac - # Note: match a space afterwards to avoid collision potential. - sed -e "/${abi_flag} /s&error.*&include <${CHOST}/${f}>&" \ + sed -e "/${MULTILIB_ABI} /s&error.*&include <${CHOST}/${f}>&" \ -i "${ED}/tmp/multilib-include${f}" || die done } -- 1.8.1.5