| 1 |
mgorny 14/06/08 13:57:02 |
| 2 |
|
| 3 |
Modified: ChangeLog multilib-build.eclass |
| 4 |
Log: |
| 5 |
Work around lack of arch defines in swig, bug #509792. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1283 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1283&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1283&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1282&r2=1.1283 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1282 |
| 18 |
retrieving revision 1.1283 |
| 19 |
diff -u -r1.1282 -r1.1283 |
| 20 |
--- ChangeLog 7 Jun 2014 10:28:16 -0000 1.1282 |
| 21 |
+++ ChangeLog 8 Jun 2014 13:57:02 -0000 1.1283 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1282 2014/06/07 10:28:16 ulm Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1283 2014/06/08 13:57:02 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 08 Jun 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 29 |
+ Work around lack of arch defines in swig, bug #509792. |
| 30 |
|
| 31 |
07 Jun 2014; Ulrich Müller <ulm@g.o> elisp.eclass: |
| 32 |
Increase minimum Emacs version to 23, versions 21 and 22 have been removed. |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.56 eclass/multilib-build.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.56&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.56&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.55&r2=1.56 |
| 41 |
|
| 42 |
Index: multilib-build.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
| 45 |
retrieving revision 1.55 |
| 46 |
retrieving revision 1.56 |
| 47 |
diff -u -r1.55 -r1.56 |
| 48 |
--- multilib-build.eclass 28 May 2014 18:53:20 -0000 1.55 |
| 49 |
+++ multilib-build.eclass 8 Jun 2014 13:57:02 -0000 1.56 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.55 2014/05/28 18:53:20 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.56 2014/06/08 13:57:02 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: multilib-build.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -476,6 +476,8 @@ |
| 59 |
# else |
| 60 |
# error "abi_ppc_32 not supported by the package." |
| 61 |
# endif |
| 62 |
+#elif defined(SWIG) /* https://sourceforge.net/p/swig/bugs/799/ */ |
| 63 |
+# error "Native ABI not supported by the package." |
| 64 |
#else |
| 65 |
# error "No ABI matched, please report a bug to bugs.gentoo.org" |
| 66 |
#endif |
| 67 |
@@ -502,6 +504,12 @@ |
| 68 |
sed -e "/abi_x86_32 /s&error.*&include <${CHOST}${f}>&" \ |
| 69 |
-i "${wrapper}" || die |
| 70 |
fi |
| 71 |
+ |
| 72 |
+ # Needed for swig. |
| 73 |
+ if multilib_is_native_abi; then |
| 74 |
+ sed -e "/Native ABI/s&error.*&include <${CHOST}${f}>&" \ |
| 75 |
+ -i "${wrapper}" || die |
| 76 |
+ fi |
| 77 |
fi |
| 78 |
done |
| 79 |
fi |
Archives