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 E44D11381F3 for ; Thu, 8 Aug 2013 10:20:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46072E09DE; Thu, 8 Aug 2013 10:20:19 +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 B6835E09DE for ; Thu, 8 Aug 2013 10:20:18 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 190C433DACA for ; Thu, 8 Aug 2013 10:20:17 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id B259D2171C; Thu, 8 Aug 2013 10:20:15 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog multilib-build.eclass X-VCS-Directories: eclass X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130808102015.B259D2171C@flycatcher.gentoo.org> Date: Thu, 8 Aug 2013 10:20:15 +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: 82299a47-67db-4694-b762-1f18a1a25041 X-Archives-Hash: 1e01bb68a3c44b52ef7148427ca81b83 mgorny 13/08/08 10:20:15 Modified: ChangeLog multilib-build.eclass Log: Allow wrapping headers that are installed only for some of the ABIs. Revision Changes Path 1.917 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.917&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.917&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.916&r2=1.917 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.916 retrieving revision 1.917 diff -u -r1.916 -r1.917 --- ChangeLog 7 Aug 2013 16:37:32 -0000 1.916 +++ ChangeLog 8 Aug 2013 10:20:15 -0000 1.917 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.916 2013/08/07 16:37:32 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.917 2013/08/08 10:20:15 mgorny Exp $ + + 08 Aug 2013; Michał Górny multilib-build.eclass: + Allow wrapping headers that are installed only for some of the ABIs. 07 Aug 2013; Mike Gilbert python-r1.eclass, python-single-r1.eclass: 1.18 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.17&r2=1.18 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- multilib-build.eclass 30 Jul 2013 02:08:54 -0000 1.17 +++ multilib-build.eclass 8 Aug 2013 10:20:15 -0000 1.18 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.17 2013/07/30 02:08:54 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.18 2013/08/08 10:20:15 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -268,10 +268,6 @@ local dir=${f%/*} - # $CHOST shall be set by multilib_toolchain_setup - dodir "/tmp/multilib-include/${CHOST}${dir}" - mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die - if [[ ! -f ${ED}/tmp/multilib-include${f} ]]; then dodir "/tmp/multilib-include${dir}" # a generic template @@ -303,28 +299,35 @@ _EOF_ fi - # XXX: get abi_* directly - local abi_flag - case "${ABI}" in - amd64|amd64_fbsd) - abi_flag=abi_x86_64;; - x86|x86_fbsd) - abi_flag=abi_x86_32;; - x32) - abi_flag=abi_x86_x32;; - n32) - abi_flag=abi_mips_n32;; - n64) - abi_flag=abi_mips_n64;; - o32) - abi_flag=abi_mips_o32;; - *) - 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}>&" \ - -i "${ED}/tmp/multilib-include${f}" || die + # Some ABIs may have install less files than others. + if [[ -f ${root}/usr/include${f} ]]; then + # $CHOST shall be set by multilib_toolchain_setup + dodir "/tmp/multilib-include/${CHOST}${dir}" + mv "${root}/usr/include${f}" "${ED}/tmp/multilib-include/${CHOST}${dir}/" || die + + # XXX: get abi_* directly + local abi_flag + case "${ABI}" in + amd64|amd64_fbsd) + abi_flag=abi_x86_64;; + x86|x86_fbsd) + abi_flag=abi_x86_32;; + x32) + abi_flag=abi_x86_x32;; + n32) + abi_flag=abi_mips_n32;; + n64) + abi_flag=abi_mips_n64;; + o32) + abi_flag=abi_mips_o32;; + *) + 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}>&" \ + -i "${ED}/tmp/multilib-include${f}" || die + fi done }