[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      13/09/30 07:27:06

  Modified:             ChangeLog multilib-build.eclass
  Log:
  Fix duplicate flags in MULTILIB_USEDEP. Thanks for the report and the patch to Ulrich Mueller.

Revision  Changes    Path
1.1002               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1002&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1002&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1001&r2=1.1002

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1001
retrieving revision 1.1002
diff -u -r1.1001 -r1.1002
--- ChangeLog	30 Sep 2013 02:28:42 -0000	1.1001
+++ ChangeLog	30 Sep 2013 07:27:06 -0000	1.1002
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1001 2013/09/30 02:28:42 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1002 2013/09/30 07:27:06 mgorny Exp $
+
+  30 Sep 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+  Fix duplicate flags in MULTILIB_USEDEP. Thanks for the report and the patch
+  to Ulrich Mueller.
 
   30 Sep 2013; Christoph Junghans <ottxor@gentoo.org>
   toolchain-binutils.eclass:



1.21                 eclass/multilib-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.20&r2=1.21

Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- multilib-build.eclass	17 Sep 2013 13:29:19 -0000	1.20
+++ multilib-build.eclass	30 Sep 2013 07:27:06 -0000	1.21
@@ -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.20 2013/09/17 13:29:19 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.21 2013/09/30 07:27:06 mgorny Exp $
 
 # @ECLASS: multilib-build.eclass
 # @MAINTAINER:
@@ -28,13 +28,13 @@
 # @ECLASS-VARIABLE: _MULTILIB_FLAGS
 # @INTERNAL
 # @DESCRIPTION:
-# The list of multilib flags and corresponding ABI values.
+# The list of multilib flags and corresponding ABI values. If the same
+# flag is reused for multiple ABIs (e.g. x86 on Linux&FreeBSD), multiple
+# ABIs may be separated by commas.
 _MULTILIB_FLAGS=(
-	abi_x86_32:x86
-	abi_x86_64:amd64
+	abi_x86_32:x86,x86_fbsd
+	abi_x86_64:amd64,amd64_fbsd
 	abi_x86_x32:x32
-	abi_x86_32:x86_fbsd
-	abi_x86_64:amd64_fbsd
 	abi_mips_n32:n32
 	abi_mips_n64:n64
 	abi_mips_o32:o32
@@ -72,16 +72,20 @@
 
 	local abis=( $(get_all_abis) )
 
+	local IFS=,
 	local abi i found
 	for abi in "${abis[@]}"; do
 		for i in "${_MULTILIB_FLAGS[@]}"; do
-			local m_abi=${i#*:}
+			local m_abis=${i#*:} m_abi
 			local m_flag=${i%:*}
 
-			if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
-				echo "${abi}"
-				found=1
-			fi
+			for m_abi in ${m_abis}; do
+				if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
+					echo "${abi}"
+					found=1
+					break 2
+				fi
+			done
 		done
 	done