| 1 |
commit: 03248de1de93bb243ae1336496270a9447843461 |
| 2 |
Author: gienah <gienah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 25 13:44:08 2014 +0000 |
| 4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 25 13:44:08 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=03248de1 |
| 7 |
|
| 8 |
openblas: Strip the _int64 suffix from the BUILD_VARIANT to calculate the ABI |
| 9 |
|
| 10 |
--- |
| 11 |
sci-libs/openblas/openblas-9999.ebuild | 24 +++++++++++++----------- |
| 12 |
1 file changed, 13 insertions(+), 11 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild |
| 15 |
index 1c2b6c6..f012efd 100644 |
| 16 |
--- a/sci-libs/openblas/openblas-9999.ebuild |
| 17 |
+++ b/sci-libs/openblas/openblas-9999.ebuild |
| 18 |
@@ -74,11 +74,15 @@ int64_multilib_get_enabled_abis() { |
| 19 |
# will be overwritten by the normal variant in the install, which removes the |
| 20 |
# #define OPENBLAS_USE64BITINT for us. We then specify it in Cflags in the |
| 21 |
# /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file. |
| 22 |
+ local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 23 |
local MULTIBUILD_VARIANTS=( ) |
| 24 |
- use int64 && \ |
| 25 |
- MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} ) |
| 26 |
- MULTIBUILD_VARIANTS+=( $(multilib_get_enabled_abis) ) |
| 27 |
- echo "${MULTIBUILD_VARIANTS[*]}" |
| 28 |
+ for i in "${MULTILIB_VARIANTS[@]}"; do |
| 29 |
+ if use int64 && [[ "${i}" =~ 64$ ]]; then |
| 30 |
+ MULTIBUILD_VARIANTS+=( "${i}_${INT64_SUFFIX}" ) |
| 31 |
+ fi |
| 32 |
+ MULTIBUILD_VARIANTS+=( "${i}" ) |
| 33 |
+ done |
| 34 |
+ echo "${MULTIBUILD_VARIANTS[@]}" |
| 35 |
} |
| 36 |
|
| 37 |
# @FUNCTION: _int64_multilib_multibuild_wrapper |
| 38 |
@@ -89,12 +93,10 @@ int64_multilib_get_enabled_abis() { |
| 39 |
_int64_multilib_multibuild_wrapper() { |
| 40 |
debug-print-function ${FUNCNAME} "${@}" |
| 41 |
|
| 42 |
- if [[ ! "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then |
| 43 |
- local ABI=${MULTIBUILD_VARIANT} |
| 44 |
- multilib_toolchain_setup "${ABI}" |
| 45 |
- export FC="$(tc-getFC) $(get_abi_CFLAGS)" |
| 46 |
- export F77="$(tc-getF77) $(get_abi_CFLAGS)" |
| 47 |
- fi |
| 48 |
+ local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}" |
| 49 |
+ multilib_toolchain_setup "${ABI}" |
| 50 |
+ export FC="$(tc-getFC) $(get_abi_CFLAGS)" |
| 51 |
+ export F77="$(tc-getF77) $(get_abi_CFLAGS)" |
| 52 |
"${@}" |
| 53 |
} |
| 54 |
|
| 55 |
@@ -191,7 +193,7 @@ src_test() { |
| 56 |
|
| 57 |
src_install() { |
| 58 |
local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) ) |
| 59 |
- my_src_install () { |
| 60 |
+ my_src_install() { |
| 61 |
local openblas_flags=$(get_openblas_flags) |
| 62 |
local profname=$(get_profname) |
| 63 |
local pcfile |
Archives