[gentoo-commits] proj/sci:lapack-multibuild commit in: sci-libs/openblas/

["Mark Wright" <gienah@gentoo.org>]

commit:     31519756bab19a0ef35f66e229f62d6aeee0ed04
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 13:44:08 2014 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sun Sep  7 09:43:47 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=31519756

openblas: Strip the _int64 suffix from the BUILD_VARIANT to calculate the ABI

---
 sci-libs/openblas/openblas-9999.ebuild | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild
index 1c2b6c6..f012efd 100644
--- a/sci-libs/openblas/openblas-9999.ebuild
+++ b/sci-libs/openblas/openblas-9999.ebuild
@@ -74,11 +74,15 @@ int64_multilib_get_enabled_abis() {
 	# will be overwritten by the normal variant in the install, which removes the
 	# #define OPENBLAS_USE64BITINT for us.  We then specify it in Cflags in the
 	# /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file.
+	local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
 	local MULTIBUILD_VARIANTS=( )
-	use int64 && \
-		MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} )
-	MULTIBUILD_VARIANTS+=( $(multilib_get_enabled_abis) )
-	echo "${MULTIBUILD_VARIANTS[*]}"
+	for i in "${MULTILIB_VARIANTS[@]}"; do
+		if use int64 && [[ "${i}" =~ 64$ ]]; then
+			MULTIBUILD_VARIANTS+=( "${i}_${INT64_SUFFIX}" )
+		fi
+		MULTIBUILD_VARIANTS+=( "${i}" )
+	done
+	echo "${MULTIBUILD_VARIANTS[@]}"
 }
 
 # @FUNCTION: _int64_multilib_multibuild_wrapper
@@ -89,12 +93,10 @@ int64_multilib_get_enabled_abis() {
 _int64_multilib_multibuild_wrapper() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	if [[ ! "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
-		local ABI=${MULTIBUILD_VARIANT}
-		multilib_toolchain_setup "${ABI}"
-		export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-		export F77="$(tc-getF77) $(get_abi_CFLAGS)"
-	fi
+	local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
+	multilib_toolchain_setup "${ABI}"
+	export FC="$(tc-getFC) $(get_abi_CFLAGS)"
+	export F77="$(tc-getF77) $(get_abi_CFLAGS)"
 	"${@}"
 }
 
@@ -191,7 +193,7 @@ src_test() {
 
 src_install() {
 	local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
-	my_src_install () {
+	my_src_install() {
 		local openblas_flags=$(get_openblas_flags)
 		local profname=$(get_profname)
 		local pcfile