svn commit: r538716 - head/science/bagel

[Thierry Thomas]

Author: thierry
Date: Sun Jun 14 09:14:03 2020
New Revision: 538716
URL: https://svnweb.freebsd.org/changeset/ports/538716

Log:
  Chase ScaLAPACK´s upgrade and resolve conflict between cblas and openblas.
  
  Approved by:	yuri (maintainer)

Modified:
  head/science/bagel/Makefile

Modified: head/science/bagel/Makefile
==============================================================================
--- head/science/bagel/Makefile	Sun Jun 14 09:13:28 2020	(r538715)
+++ head/science/bagel/Makefile	Sun Jun 14 09:14:03 2020	(r538716)
@@ -3,7 +3,7 @@
 PORTNAME=	bagel
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 
 MAINTAINER=	yuri at FreeBSD.org
@@ -14,10 +14,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	error: static_assert failed "size_t is assumed to be the same size as unsigned long long"
 
-LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
-		libcblas.so:math/cblas
+LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs
 
-USES=		autoreconf compiler:c++11-lang fortran gmake libtool localbase python:build
+USES=		autoreconf blaslapack:openblas compiler:c++11-lang fortran gmake libtool localbase python:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datarootdir=${DATADIR}
 USE_GITHUB=	yes
@@ -38,11 +37,9 @@ LIBXC_LIB_DEPENDS=		libxc.so:science/libxc
 
 SCALAPACK_DESC=			Use ScaLapack library for parallelized linear algebra
 SCALAPACK_CONFIGURE_ENABLE=	scalapack
-SCALAPACK_VARS=			LDFLAGS+="-lcblas -lscalapack"
-SCALAPACK_VARS_OFF=		LDFLAGS+="-lcblas -llapack -lblas" # -llapack -lblas are a replacement of libscalapack
+SCALAPACK_VARS=			LDFLAGS+="-lscalapack"
+SCALAPACK_VARS_OFF=		LDFLAGS+="${BLASLIB} ${LAPACKLIB}" # -llapack -lblas are a replacement of libscalapack
 SCALAPACK_LIB_DEPENDS=		libscalapack.so:math/scalapack
-SCALAPACK_LIB_DEPENDS_OFF=	liblapack.so:math/lapack \
-				libblas.so:math/blas
 SCALAPACK_IMPLIES=		MPI
 
 SMITH_DESC=			Compile SMITH generated code