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

[Francois Bissey]

commit:     016ec1d0bdaa14b88e3556dffc692ba1de7969f5
Author:     François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Mon Oct 13 09:17:07 2014 +0000
Commit:     Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz>
CommitDate: Mon Oct 13 09:17:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=016ec1d0

Fix support for xblas, it is only available for 32bit integers.

---
 sci-libs/lapack-reference/lapack-reference-9999.ebuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild 
b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 02e8871..18e5e7c 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -136,7 +136,7 @@ src_prepare() {
                SRC/CMakeLists.txt || die
        sed -i \
                -e 's:-llapack:-l${LIBNAME}:g' \
-               -e 's/Requires: blas/Requires: 
${BLAS_PROFNAME}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}/' \
+               -e 's/Requires: blas/Requires: ${BLAS_PROFNAME} 
${XBLASPC}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}/' \
                lapack.pc.in || die
        # some string does not get passed properly
        sed -i \
@@ -146,12 +146,6 @@ src_prepare() {
        sed -i \
                -e '/lapack_install_library(tmglib)/d' \
                TESTING/MATGEN/CMakeLists.txt || die
-       # if xblas is used add it in the .pc file
-       if use xblas ; then
-               sed -i \
-                       -e '/Requires/s:blas:blas xblas:' \
-                       lapack.pc.in || die
-       fi
 }
 
 src_configure() {
@@ -160,6 +154,7 @@ src_configure() {
                local profname=$(get_profname)
                local libname="${profname//-/_}"
                local blas_profname=$(get_blas_profname)
+               local xblaspc=""
                local mycmakeargs=(
                        -DPROFNAME="${profname}"
                        -DBLAS_PROFNAME="${blas_profname}"
@@ -167,18 +162,23 @@ src_configure() {
                        -DUSE_OPTIMIZED_BLAS=ON
                        -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs 
${blas_profname})"
                        $(cmake-utils_use_build test TESTING)
-                       $(cmake-utils_use_use xblas XBLAS)
                        $@
                )
+               # xblas is only available for 32bit integers
                if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
                        mycmakeargs+=(
                                -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8 ${FCFLAGS}"
                                -DLAPACK_PKGCONFIG_FFLAGS="-fdefault-integer-8"
+                               -DXBLASPC=""
+                               -DUSE_XBLAS=OFF
                        )
                else
+                       use xblas && xblaspc="xblas"
                        mycmakeargs+=(
                                -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) 
--cflags ${blas_profname}) $(get_abi_CFLAGS) ${FCFLAGS}"
                                -DLAPACK_PKGCONFIG_FFLAGS=""
+                               -DXBLASPC="${xblaspc}"
+                               $(cmake-utils_use_use xblas XBLAS)
                        )
                fi
                if [[ "${MULTIBUILD_ID}" =~ "_${STATIC_SUFFIX}" ]]; then