| 1 |
mgorny 13/09/30 07:27:06 |
| 2 |
|
| 3 |
Modified: ChangeLog multilib-build.eclass |
| 4 |
Log: |
| 5 |
Fix duplicate flags in MULTILIB_USEDEP. Thanks for the report and the patch to Ulrich Mueller. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1002 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1002&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1002&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1001&r2=1.1002 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1001 |
| 18 |
retrieving revision 1.1002 |
| 19 |
diff -u -r1.1001 -r1.1002 |
| 20 |
--- ChangeLog 30 Sep 2013 02:28:42 -0000 1.1001 |
| 21 |
+++ ChangeLog 30 Sep 2013 07:27:06 -0000 1.1002 |
| 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.1001 2013/09/30 02:28:42 ottxor Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1002 2013/09/30 07:27:06 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 30 Sep 2013; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 29 |
+ Fix duplicate flags in MULTILIB_USEDEP. Thanks for the report and the patch |
| 30 |
+ to Ulrich Mueller. |
| 31 |
|
| 32 |
30 Sep 2013; Christoph Junghans <ottxor@g.o> |
| 33 |
toolchain-binutils.eclass: |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.21 eclass/multilib-build.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.21&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.21&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.20&r2=1.21 |
| 42 |
|
| 43 |
Index: multilib-build.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
| 46 |
retrieving revision 1.20 |
| 47 |
retrieving revision 1.21 |
| 48 |
diff -u -r1.20 -r1.21 |
| 49 |
--- multilib-build.eclass 17 Sep 2013 13:29:19 -0000 1.20 |
| 50 |
+++ multilib-build.eclass 30 Sep 2013 07:27:06 -0000 1.21 |
| 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/multilib-build.eclass,v 1.20 2013/09/17 13:29:19 tommy Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.21 2013/09/30 07:27:06 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: multilib-build.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -28,13 +28,13 @@ |
| 60 |
# @ECLASS-VARIABLE: _MULTILIB_FLAGS |
| 61 |
# @INTERNAL |
| 62 |
# @DESCRIPTION: |
| 63 |
-# The list of multilib flags and corresponding ABI values. |
| 64 |
+# The list of multilib flags and corresponding ABI values. If the same |
| 65 |
+# flag is reused for multiple ABIs (e.g. x86 on Linux&FreeBSD), multiple |
| 66 |
+# ABIs may be separated by commas. |
| 67 |
_MULTILIB_FLAGS=( |
| 68 |
- abi_x86_32:x86 |
| 69 |
- abi_x86_64:amd64 |
| 70 |
+ abi_x86_32:x86,x86_fbsd |
| 71 |
+ abi_x86_64:amd64,amd64_fbsd |
| 72 |
abi_x86_x32:x32 |
| 73 |
- abi_x86_32:x86_fbsd |
| 74 |
- abi_x86_64:amd64_fbsd |
| 75 |
abi_mips_n32:n32 |
| 76 |
abi_mips_n64:n64 |
| 77 |
abi_mips_o32:o32 |
| 78 |
@@ -72,16 +72,20 @@ |
| 79 |
|
| 80 |
local abis=( $(get_all_abis) ) |
| 81 |
|
| 82 |
+ local IFS=, |
| 83 |
local abi i found |
| 84 |
for abi in "${abis[@]}"; do |
| 85 |
for i in "${_MULTILIB_FLAGS[@]}"; do |
| 86 |
- local m_abi=${i#*:} |
| 87 |
+ local m_abis=${i#*:} m_abi |
| 88 |
local m_flag=${i%:*} |
| 89 |
|
| 90 |
- if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then |
| 91 |
- echo "${abi}" |
| 92 |
- found=1 |
| 93 |
- fi |
| 94 |
+ for m_abi in ${m_abis}; do |
| 95 |
+ if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then |
| 96 |
+ echo "${abi}" |
| 97 |
+ found=1 |
| 98 |
+ break 2 |
| 99 |
+ fi |
| 100 |
+ done |
| 101 |
done |
| 102 |
done |
Archives