[gentoo-commits] proj/sci:int64-build-eclass commit in: sci-libs/lapack-reference/

[Mark Wright]

commit:     e637a501c0ed51b4f81e0433fb3c848d4a9e0e99
Author:     gienah <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 14 03:21:04 2014 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Oct 14 03:21:04 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e637a501

Thanks to tamiko for testing - the earlier fix for xblas, 
-DXBLAS_LIBRARY:FILEPATH="${ROOT}usr/$(get_libdir)/lib${xblas_libname}.so", 
breaks the build with USE=-xblas, so only do this when use xblas.

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

diff --git a/sci-libs/lapack-reference/ChangeLog 
b/sci-libs/lapack-reference/ChangeLog
index 89abcfe..3228277 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 
2010/10/02 20:49:51 grobian Exp $
 
+  14 Oct 2014; Mark Wright <gie...@gentoo.org> lapack-reference-9999.ebuild:
+  Thanks to tamiko for testing - the earlier fix for xblas,
+  -DXBLAS_LIBRARY:FILEPATH="${ROOT}usr/$(get_libdir)/lib${xblas_libname}.so",
+  breaks the build with USE=-xblas, so only do this when use xblas.
+
   13 Oct 2014; Mark Wright <gie...@gentoo.org> lapack-reference-9999.ebuild:
   Specify the xblas library location to cmake -
   sci-libs/lapack-reference-9999::science USE="int64 static-libs {test*}

diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild 
b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 0ba3b3f..a1f4515 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -33,8 +33,8 @@ SLOT="0"
 IUSE="int64 static-libs test xblas"
 
 RDEPEND="
-       >=virtual/blas-2.1-r1[int64?]
-       xblas? ( sci-libs/xblas[fortran] )"
+       >=virtual/blas-2.1-r3[int64?]
+       xblas? ( sci-libs/xblas[fortran,int64?] )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 PDEPEND="
@@ -95,8 +95,9 @@ src_configure() {
                        -DCMAKE_CXX_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) ${CXXFLAGS}"
                        -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags 
${blas_profname}) $(get_abi_CFLAGS) 
$(fortran-int64_get_fortran_int64_abi_fflags) ${FCFLAGS}"
                        
-DLAPACK_PKGCONFIG_FFLAGS="$(fortran-int64_get_fortran_int64_abi_fflags)"
-                       
-DXBLAS_LIBRARY:FILEPATH="${ROOT}usr/$(get_libdir)/lib${xblas_libname}.so"
                )
+               use xblas && \
+                       mycmakeargs+=( 
-DXBLAS_LIBRARY:FILEPATH="${ROOT}usr/$(get_libdir)/lib${xblas_libname}.so" )
                if $(fortran-int64_is_static_build); then
                        mycmakeargs+=(
                                -DBUILD_SHARED_LIBS=OFF