On Sun, Oct 21 2018, Marc Espie <es...@nerim.net> wrote:
> Here's a revised version of the armadillo port, adding arpack and hdf5
> as a dependency.
>
> And the missed COMPILER line, oops.
>
> Notes:
> - I definitely prefer to be explicit for CONFIGURE_STYLE
grep says that most ports rely on the cmake module setting up
CONFIGURE_STYLE. Just sayin'...
> - with arpack added, no need for explicit depends on blas/lapack,
> as arpack needs them anyway.
Not sure what's the point of trimming the list of deps, especially as
armadillo explicitely references code from blas, lapack and arpack.
I don't think it makes maintenance any easier, rather the opposite.
That said...
I like this updated version, ok jca@
Regarding libgfortran,
> - the library definitely requires linking with the gfortran library
> because some of lapack blas want symbols in there
Yeah I see. IIUC blas, apack and arpack don't register the dep on
libgfortran because of a build system quirk (linking is done with with
cc instead of gfortran). A simple diff like below would register the
dep on libgfortran, and remove the need for patch-CMakeLists_txt.
cc'ing steven@ (maintainer)
Thoughts, ok?
Index: blas/Makefile
===================================================================
RCS file: /cvs/ports/math/blas/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- blas/Makefile 13 Nov 2017 06:56:38 -0000 1.27
+++ blas/Makefile 21 Oct 2018 14:31:16 -0000
@@ -4,6 +4,7 @@ COMMENT= Basic Linear Algebra Subprogram
VERSION= 3.7.1
DISTNAME= blas-${VERSION}
+REVISION= 0
SHARED_LIBS= blas 2.1
Index: blas/files/Makefile
===================================================================
RCS file: /cvs/ports/math/blas/files/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- blas/files/Makefile 13 Nov 2017 06:56:38 -0000 1.3
+++ blas/files/Makefile 21 Oct 2018 14:31:16 -0000
@@ -25,6 +25,7 @@ SRCS = caxpy.f ccopy.f cdotc.f cdotu.
zhpmv.f zhpr.f zhpr2.f zrotg.f zscal.f zswap.f zsymm.f \
zsyr2k.f zsyrk.f ztbmv.f ztbsv.f ztpmv.f ztpsv.f ztrmm.f \
ztrmv.f ztrsm.f ztrsv.f xerbla_array.f
+LDADD = -lgfortran
printsrc:
@echo ${SRCS}
Index: lapack/Makefile
===================================================================
RCS file: /cvs/ports/math/lapack/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- lapack/Makefile 13 Nov 2017 06:57:36 -0000 1.26
+++ lapack/Makefile 21 Oct 2018 14:31:16 -0000
@@ -4,6 +4,7 @@ COMMENT= library of Fortran linear algeb
VERSION= 3.7.1
DISTNAME= lapack-${VERSION}
+REVISION= 0
SHARED_LIBS= lapack 6.0
Index: lapack/files/Makefile
===================================================================
RCS file: /cvs/ports/math/lapack/files/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- lapack/files/Makefile 13 Nov 2017 06:57:36 -0000 1.7
+++ lapack/files/Makefile 21 Oct 2018 14:31:53 -0000
@@ -384,6 +384,7 @@ ZLASRC = \
SRCS=${SLASRC} ${DLASRC} ${DSLASRC} ${CLASRC} ${ZLASRC} ${ZCLASRC} \
${SCLAUX} ${DZLAUX} ${ALLAUX}
+LDADD= -lgfortran
printsrc:
@echo ${SRCS}
Index: arpack/Makefile
===================================================================
RCS file: /cvs/ports/math/arpack/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- arpack/Makefile 13 Nov 2017 07:09:06 -0000 1.16
+++ arpack/Makefile 21 Oct 2018 14:31:16 -0000
@@ -4,7 +4,7 @@ COMMENT= solve large scale eigenvalue pr
DISTNAME= arpack96
PKGNAME= arpack-96
-REVISION= 5
+REVISION= 6
SHARED_LIBS= arpack 1.0
CATEGORIES= math
Index: arpack/files/Makefile
===================================================================
RCS file: /cvs/ports/math/arpack/files/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- arpack/files/Makefile 19 Oct 2006 16:19:54 -0000 1.1.1.1
+++ arpack/files/Makefile 21 Oct 2018 14:31:16 -0000
@@ -18,5 +18,6 @@ SRCS= sgetv0.f slaqrb.f sstqrb.f ssortc.
zgetv0.f zsortc.f zstatn.f \
zvout.f zmout.f \
icnteq.f icopy.f iset.f iswap.f ivout.f second.f
+LDADD= -lgfortran
.include <bsd.lib.mk>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
