diff options
| author | thor <thor@pkgsrc.org> | 2022-07-07 13:39:48 +0000 |
|---|---|---|
| committer | thor <thor@pkgsrc.org> | 2022-07-07 13:39:48 +0000 |
| commit | 9adeef0551bb91f89d47f631686a975075a8c9de (patch) | |
| tree | fb3e7a25ecc2434738273e0f048847e2e1fe8bee | |
| parent | 4d206362a070e79aa0a03c87e6a15a99d27179b2 (diff) | |
| download | pkgsrc-9adeef0551bb91f89d47f631686a975075a8c9de.tar.gz | |
math/arpack-ng: update BLAS support for all choices and add mpi option
| -rw-r--r-- | math/arpack-ng/Makefile | 13 | ||||
| -rw-r--r-- | math/arpack-ng/PLIST | 6 | ||||
| -rw-r--r-- | math/arpack-ng/options.mk | 15 |
3 files changed, 25 insertions, 9 deletions
diff --git a/math/arpack-ng/Makefile b/math/arpack-ng/Makefile index 438a9c75d56..7b02e82bb88 100644 --- a/math/arpack-ng/Makefile +++ b/math/arpack-ng/Makefile @@ -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 @@ CONFIGURE_DIRS= ${OBJDIR} 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 --git a/math/arpack-ng/PLIST b/math/arpack-ng/PLIST index 6fd9bc8168d..04490a13fdc 100644 --- a/math/arpack-ng/PLIST +++ b/math/arpack-ng/PLIST @@ -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/cmake/arpack-ng/arpack-ng-config.cmake 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 --git a/math/arpack-ng/options.mk b/math/arpack-ng/options.mk new file mode 100644 index 00000000000..5487046267c --- /dev/null +++ b/math/arpack-ng/options.mk @@ -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 |