mgorny 14/06/08 13:57:02 Modified: ChangeLog multilib-build.eclass Log: Work around lack of arch defines in swig, bug #509792.
Revision Changes Path 1.1283 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1283&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1283&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1282&r2=1.1283 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1282 retrieving revision 1.1283 diff -u -r1.1282 -r1.1283 --- ChangeLog 7 Jun 2014 10:28:16 -0000 1.1282 +++ ChangeLog 8 Jun 2014 13:57:02 -0000 1.1283 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1282 2014/06/07 10:28:16 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1283 2014/06/08 13:57:02 mgorny Exp $ + + 08 Jun 2014; Michał Górny <[email protected]> multilib-build.eclass: + Work around lack of arch defines in swig, bug #509792. 07 Jun 2014; Ulrich Müller <[email protected]> elisp.eclass: Increase minimum Emacs version to 23, versions 21 and 22 have been removed. 1.56 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.56&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.56&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.55&r2=1.56 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- multilib-build.eclass 28 May 2014 18:53:20 -0000 1.55 +++ multilib-build.eclass 8 Jun 2014 13:57:02 -0000 1.56 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.55 2014/05/28 18:53:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.56 2014/06/08 13:57:02 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -476,6 +476,8 @@ # else # error "abi_ppc_32 not supported by the package." # endif +#elif defined(SWIG) /* https://sourceforge.net/p/swig/bugs/799/ */ +# error "Native ABI not supported by the package." #else # error "No ABI matched, please report a bug to bugs.gentoo.org" #endif @@ -502,6 +504,12 @@ sed -e "/abi_x86_32 /s&error.*&include <${CHOST}${f}>&" \ -i "${wrapper}" || die fi + + # Needed for swig. + if multilib_is_native_abi; then + sed -e "/Native ABI/s&error.*&include <${CHOST}${f}>&" \ + -i "${wrapper}" || die + fi fi done fi
