| 1 |
mgorny 13/11/20 19:23:45 |
| 2 |
|
| 3 |
Modified: ChangeLog cmake-multilib.eclass |
| 4 |
Log: |
| 5 |
Run multilib header wrapping only when multiple ABIs are enabled, bug #491752. Other eclasses do that already. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1063 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1063&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1063&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1062&r2=1.1063 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1062 |
| 18 |
retrieving revision 1.1063 |
| 19 |
diff -u -r1.1062 -r1.1063 |
| 20 |
--- ChangeLog 20 Nov 2013 09:19:19 -0000 1.1062 |
| 21 |
+++ ChangeLog 20 Nov 2013 19:23:45 -0000 1.1063 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1062 2013/11/20 09:19:19 slyfox Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1063 2013/11/20 19:23:45 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 20 Nov 2013; Michał Górny <mgorny@g.o> cmake-multilib.eclass: |
| 29 |
+ Run multilib header wrapping only when multiple ABIs are enabled, bug |
| 30 |
+ #491752. Other eclasses do that already. |
| 31 |
|
| 32 |
20 Nov 2013; Sergei Trofimovich <slyfox@g.o> haskell-cabal.eclass: |
| 33 |
Added 'replace-hcflags()'. Filters HCFLAGS. |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.4 eclass/cmake-multilib.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-multilib.eclass?rev=1.4&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-multilib.eclass?rev=1.4&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-multilib.eclass?r1=1.3&r2=1.4 |
| 42 |
|
| 43 |
Index: cmake-multilib.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v |
| 46 |
retrieving revision 1.3 |
| 47 |
retrieving revision 1.4 |
| 48 |
diff -u -r1.3 -r1.4 |
| 49 |
--- cmake-multilib.eclass 6 Sep 2013 17:11:52 -0000 1.3 |
| 50 |
+++ cmake-multilib.eclass 20 Nov 2013 19:23:45 -0000 1.4 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2013 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v 1.3 2013/09/06 17:11:52 axs Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v 1.4 2013/11/20 19:23:45 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: cmake-multilib.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -48,9 +48,12 @@ |
| 60 |
cmake-multilib_secure_install() { |
| 61 |
cmake-utils_src_install "${@}" |
| 62 |
|
| 63 |
- # Make sure all headers are the same for each ABI. |
| 64 |
- multilib_prepare_wrappers |
| 65 |
- multilib_check_headers |
| 66 |
+ # Do multilib magic only when >1 ABI is used. |
| 67 |
+ if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then |
| 68 |
+ multilib_prepare_wrappers |
| 69 |
+ # Make sure all headers are the same for each ABI. |
| 70 |
+ multilib_check_headers |
| 71 |
+ fi |
| 72 |
} |
| 73 |
|
| 74 |
multilib_foreach_abi cmake-multilib_secure_install "${@}" |
Archives