[gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/

[Justin Lecher]

commit:     cbbbed04e53145c0b018be3b16b495c682537b23
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 11:40:30 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 11:40:30 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cbbbed04

Fix rebase lapack-multibuild to master conflict 11 on sci-libs/lapack-reference

---
 sci-libs/lapack-reference/ChangeLog                    | 5 +++++
 sci-libs/lapack-reference/lapack-reference-9999.ebuild | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sci-libs/lapack-reference/ChangeLog 
b/sci-libs/lapack-reference/ChangeLog
index 6fbd2ea..85c2139 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -11,6 +11,11 @@
   lapack-reference-9999.ebuild:
   Add xblas to the .pc file when it is in use see bug#523388
 
+  07 Sep 2014; Mark Wright <gie...@gentoo.org> lapack-reference-9999.ebuild:
+  Remove the lines changing the setting of the FC and F77 environment
+  variables, instead pass the $(get_abi_CFLAGS) to cmake in the setting of the
+  -DCMAKE_Fortran_FLAGS variable.
+
   26 Apr 2014; Mark Wright <gie...@gentoo.org> lapack-reference-9999.ebuild:
   Add >=virtual/blas-2.1-r2[int64?] and >=virtual/lapack-3.5-r2[int64?] to
   RDEPEND. Use separate eselect modules for lapack and lapack-int64.

diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild 
b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 17f3a04..e2ef959 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -114,8 +114,6 @@ _int64_multilib_multibuild_wrapper() {
        local v="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}"
        local ABI="${v/_${STATIC_SUFFIX}/}"
        multilib_toolchain_setup "${ABI}"
-       export FC="$(tc-getFC) $(get_abi_CFLAGS)"
-       export F77="$(tc-getF77) $(get_abi_CFLAGS)"
        "${@}"
 }
 
@@ -175,12 +173,12 @@ src_configure() {
                )
                if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
                        mycmakeargs+=(
-                               -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) -fdefault-integer-8"
+                               -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8"
                                -DLAPACK_PKGCONFIG_FFLAGS="-fdefault-integer-8"
                        )
                else
                        mycmakeargs+=(
-                               -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname})"
+                               -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS)"
                                -DLAPACK_PKGCONFIG_FFLAGS=""
                        )
                fi