pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/arpack-ng math/arpack-ng: update BLAS support for...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ee209aac661
branches:  trunk
changeset: 381451:0ee209aac661
user:      thor <thor%pkgsrc.org@localhost>
date:      Thu Jul 07 13:39:48 2022 +0000

description:
math/arpack-ng: update BLAS support for all choices and add mpi option

diffstat:

 math/arpack-ng/Makefile   |  13 +++++--------
 math/arpack-ng/PLIST      |   6 +++++-
 math/arpack-ng/options.mk |  15 +++++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diffs (67 lines):

diff -r 92e2434b9386 -r 0ee209aac661 math/arpack-ng/Makefile
--- a/math/arpack-ng/Makefile   Thu Jul 07 13:27:26 2022 +0000
+++ b/math/arpack-ng/Makefile   Thu Jul 07 13:39:48 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2021/06/23 18:10:19 thor Exp $
+# $NetBSD: Makefile,v 1.7 2022/07/07 13:39:48 thor Exp $
 
 DISTNAME=      arpack-ng-3.8.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=opencollab/}
 
@@ -20,13 +20,10 @@
 CMAKE_ARG_PATH=        ..
 CMAKE_ARGS+=   -DBUILD_SHARED_LIBS:BOOL=ON
 
-BLAS_ACCEPTED= netlib openblas
 .include "../../mk/blas.buildlink3.mk"
-.if ${BLAS_TYPE} == "netlib"
-CMAKE_ARGS+=   -DBLA_VENDOR=Generic
-.elif ${BLAS_TYPE} == "openblas"
-CMAKE_ARGS+=   -DBLA_VENDOR=OpenBLAS
-.endif
+CMAKE_ARGS+=   -DBLA_PREFER_PKGCONFIG=true -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
+
+.include "options.mk"
 
 TEST_TARGET=   test
 
diff -r 92e2434b9386 -r 0ee209aac661 math/arpack-ng/PLIST
--- a/math/arpack-ng/PLIST      Thu Jul 07 13:27:26 2022 +0000
+++ b/math/arpack-ng/PLIST      Thu Jul 07 13:39:48 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/05/11 10:18:37 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/07/07 13:39:48 thor Exp $
 include/arpack/arpackdef.h
 include/arpack/arpackicb.h
 include/arpack/debug.h
@@ -8,4 +8,8 @@
 lib/libarpack.so
 lib/libarpack.so.2
 lib/libarpack.so.2.1.0
+${PLIST.mpi}lib/libparpack.so
+${PLIST.mpi}lib/libparpack.so.2
+${PLIST.mpi}lib/libparpack.so.2.1.0
 lib/pkgconfig/arpack.pc
+${PLIST.mpi}lib/pkgconfig/parpack.pc
diff -r 92e2434b9386 -r 0ee209aac661 math/arpack-ng/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/arpack-ng/options.mk Thu Jul 07 13:39:48 2022 +0000
@@ -0,0 +1,15 @@
+PKG_OPTIONS_VAR=       PKG_OPTIONS.arpack-ng
+PKG_SUPPORTED_OPTIONS= mpi
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=           mpi
+.if !empty(PKG_OPTIONS:Mmpi)
+PLIST.mpi=             yes
+CMAKE_ARGS+=   -DMPI=on
+.include "../../mk/mpi.buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DMPI=off
+.endif



Home | Main Index | Thread Index | Old Index