diff options
Diffstat (limited to '')
| -rw-r--r-- | math/blacs/Makefile | 4 | ||||
| -rw-r--r-- | math/blacs/files/Bmake.inc-mpich.diff | 2 | ||||
| -rw-r--r-- | math/blacs/files/patch-SRC_MPI_Bdef.h | 20 | ||||
| -rw-r--r-- | math/blacs/files/patch-SRC_MPI_blacs__get__.c | 11 | ||||
| -rw-r--r-- | math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c | 15 | ||||
| -rw-r--r-- | math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c | 11 |
6 files changed, 58 insertions, 5 deletions
diff --git a/math/blacs/Makefile b/math/blacs/Makefile index 8e696c89704d..f550f55ff9a4 100644 --- a/math/blacs/Makefile +++ b/math/blacs/Makefile @@ -1,6 +1,6 @@ PORTNAME= blacs PORTVERSION= 1.7 -PORTREVISION= 40 +PORTREVISION= 41 CATEGORIES= math MASTER_SITES= NETLIB/blacs DISTNAME= BLACS @@ -36,7 +36,7 @@ MPICH_EXTRA_PATCHES= ${FILESDIR}/Bmake.inc-mpich.diff .include <bsd.port.pre.mk> F77EXTRAFLAGS= #-w -fno-globals -fugly-complex -.if ${GCC_DEFAULT} >= 10 +.if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10 # workaround for Rank mismatch between actual argument at (1) and actual argument at (2) (scalar and rank-1) F77EXTRAFLAGS+= -fallow-argument-mismatch .endif diff --git a/math/blacs/files/Bmake.inc-mpich.diff b/math/blacs/files/Bmake.inc-mpich.diff index 5224616e5cc8..3e30b122de6f 100644 --- a/math/blacs/files/Bmake.inc-mpich.diff +++ b/math/blacs/files/Bmake.inc-mpich.diff @@ -35,7 +35,7 @@ MPILIBdir = $(MPIdir)/lib/ MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpich.a -+ MPILIB = -lmpi -lmpifort -pthread ++ MPILIB = -lmpi -lmpifort -pthread -L$(MPILIBdir) # ------------------------------------- # All libraries required by the tester. diff --git a/math/blacs/files/patch-SRC_MPI_Bdef.h b/math/blacs/files/patch-SRC_MPI_Bdef.h index 75a6acbe5696..adcdd43918c2 100644 --- a/math/blacs/files/patch-SRC_MPI_Bdef.h +++ b/math/blacs/files/patch-SRC_MPI_Bdef.h @@ -1,6 +1,22 @@ ---- SRC/MPI/Bdef.h.orig 2020-04-21 20:22:36 UTC +--- SRC/MPI/Bdef.h.orig 1998-03-13 20:14:33 UTC +++ SRC/MPI/Bdef.h -@@ -1605,9 +1605,9 @@ int BI_ContxtNum(); +@@ -322,6 +322,15 @@ int BI_ContxtNum(BLACSCONTEXT *ctxt); + void BI_BlacsWarn(int ConTxt, int line, char *file, char *form, ...); + void BI_BlacsErr(int ConTxt, int line, char *file, char *form, ...); + int BI_ContxtNum(BLACSCONTEXT *ctxt); ++void BI_TransDist(BLACSCONTEXT *ctxt, char scope, int m, int n, int *rA, ++ int *cA, int ldrc, BI_DistType *dist, int rdest, int cdest); ++void BI_dmvcopy(int m, int n, double *A, int lda, double *buff); ++void BI_dvmcopy(int m, int n, double *A, int lda, double *buff); ++void BI_imvcopy(int m, int n, int *A, int lda, int *buff); ++void BI_ivmcopy(int m, int n, int *A, int lda, int *buff); ++void BI_smvcopy(int m, int n, float *A, int lda, float *buff); ++void BI_svmcopy(int m, int n, float *A, int lda, float *buff); ++void Cblacs_pinfo(int *mypnum, int *nprocs); + #else + void BI_BlacsWarn(); + void BI_BlacsErr(); +@@ -1605,9 +1614,9 @@ int BI_ContxtNum(); #else #define BI_MPI_Type_struct(count_, lens_, disps_, types_, newtype_, ierr_) \ { \ diff --git a/math/blacs/files/patch-SRC_MPI_blacs__get__.c b/math/blacs/files/patch-SRC_MPI_blacs__get__.c new file mode 100644 index 000000000000..02f1b33c989e --- /dev/null +++ b/math/blacs/files/patch-SRC_MPI_blacs__get__.c @@ -0,0 +1,11 @@ +--- SRC/MPI/blacs_get_.c.orig 2006-01-18 21:36:03 UTC ++++ SRC/MPI/blacs_get_.c +@@ -12,6 +12,8 @@ F_VOID_FUNC blacs_get_(int *ConTxt, int *what, int *va + #else + int comm; + #endif ++ void BI_MPI_C_to_f77_trans_comm(MPI_Comm, int *); ++ void BI_MPI_F77_to_c_trans_comm(int F77comm, MPI_Comm *Ccomm); + BLACSCONTEXT *ctxt; + + switch( Mpval(what) ) diff --git a/math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c b/math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c new file mode 100644 index 000000000000..6c102072a27b --- /dev/null +++ b/math/blacs/files/patch-SRC_MPI_blacs__gridinit__.c @@ -0,0 +1,15 @@ +--- SRC/MPI/blacs_gridinit_.c.orig 2006-01-18 21:36:03 UTC ++++ SRC/MPI/blacs_gridinit_.c +@@ -6,7 +6,12 @@ F_VOID_FUNC blacs_gridinit_(int *ConTxt, F_CHAR order, + F_VOID_FUNC blacs_gridinit_(int *ConTxt, F_CHAR order, int *nprow, int *npcol) + #endif + { ++#if (INTFACE == C_CALL) + void Cblacs_gridmap(int *, int *, int, int, int); ++#else ++ F_VOID_FUNC blacs_gridmap_(int *ConTxt, int *usermap, int *ldup, int *nprow0, ++ int *npcol0); ++#endif + int *tmpgrid, *iptr; + int i, j; + diff --git a/math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c b/math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c new file mode 100644 index 000000000000..5d6f5111549a --- /dev/null +++ b/math/blacs/files/patch-SRC_MPI_blacs__pinfo__.c @@ -0,0 +1,11 @@ +--- SRC/MPI/blacs_pinfo_.c.orig 1998-03-13 20:16:27 UTC ++++ SRC/MPI/blacs_pinfo_.c +@@ -1,5 +1,8 @@ + #include "Bdef.h" + ++void bi_f77_init_(void); ++void bi_f77_get_constants_(int*, int*, int*); ++ + #if (INTFACE == C_CALL) + void Cblacs_pinfo(int *mypnum, int *nprocs) + #else |