Date: Thu, 5 Feb 2015 22:51:23 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378498 - head/science/mbdyn Message-ID: <201502052251.t15MpNMP098812@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Thu Feb 5 22:51:22 2015 New Revision: 378498 URL: https://svnweb.freebsd.org/changeset/ports/378498 QAT: https://qat.redports.org/buildarchive/r378498/ Log: - Use blaslapack - Fix configure with Gotoblas2 - Fix umfpack detection - Pet portlint. Modified: head/science/mbdyn/Makefile Modified: head/science/mbdyn/Makefile ============================================================================== --- head/science/mbdyn/Makefile Thu Feb 5 22:40:37 2015 (r378497) +++ head/science/mbdyn/Makefile Thu Feb 5 22:51:22 2015 (r378498) @@ -17,6 +17,7 @@ LIB_DEPENDS= libarpack.so:${PORTSDIR}/ma GNU_CONFIGURE= yes USES= fortran gmake libtool +USE_LDCONFIG= yes CPPFLAGS+= -fpermissive -I${LOCALBASE}/include/suitesparse LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --program-prefix='' @@ -28,6 +29,21 @@ METIS_DESC= Enable metis-support CHACO_DESC= Enable chaco-support GINAC_DESC= Enable GiNaC-support (not implemented yet) TCL_DESC= Enable tcl-support (not implemented yet) +OPTIONS_RADIO= BLAS +OPTIONS_RADIO_BLAS= REFERENCE GOTOBLAS ATLAS +OPTIONS_DEFAULT= REFERENCE + +REFERENCE_DESC= Blas / Lapack +REFERENCE_USES= blaslapack:netlib +REFERENCE_CONFIGURE_ON= --with-blas=blas + +ATLAS_DESC= ATLAS +ATLAS_USES= blaslapack:atlas +ATLAS_CONFIGURE_ON= --with-blas=atlas + +GOTOBLAS_DESC= GotoBLAS2 +GOTOBLAS_USES= blaslapack:gotoblas +GOTOBLAS_CONFIGURE_ON= --with-blas=goto --with-goto=goto2 .include <bsd.port.pre.mk> @@ -35,23 +51,6 @@ TCL_DESC= Enable tcl-support (not implem BROKEN= Does not compile on powerpc .endif -WITH_BLAS?= reference - -. if ${WITH_BLAS} == reference -LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas \ - liblapack.so:${PORTSDIR}/math/lapack -CONFIGURE_ARGS+= --with-blas=blas -LAPACK_LIBS= -llapack -.elif ${WITH_BLAS} == gotoblas -LIB_DEPENDS+= libgoto.so:${PORTSDIR}/math/gotoblas -CONFIGURE_ARGS+= --with-blas=goto --with-goto=goto2 -LAPACK_LIBS= -lgoto2 -.elif ${WITH_BLAS} == atlas -LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas -CONFIGURE_ARGS+= --with-blas=atlas -LAPACK_LIBS= -lalapack -.endif - .if ${PORT_OPTIONS:MMPI} LIB_DEPENDS+= libmpich.so:${PORTSDIR}/net/mpich2 CONFIGURE_ARGS+= --with-mpi=yes --enable-schur @@ -80,7 +79,7 @@ CONFIGURE_ARGS+= --with-chaco=no .if ${PORT_OPTIONS:MGINAC} LIB_DEPENDS+= libmetis.so:${PORTSDIR}/math/metis4 \ - ginac:${PORTSDIR}/math/GiNaC + libginac.so:${PORTSDIR}/math/GiNaC CONFIGURE_ARGS+= --with-ginac=yes CPPFLAGS+= -I${LOCALBASE}/include/metis .else @@ -96,8 +95,9 @@ CPPFLAGS+= -I${LOCALBASE}/include/tcl8.4 CONFIGURE_ARGS+= --with-tcl=no .endif -post-patch: - ${REINPLACE_CMD} -e '/try_lapack_LIBS=/s/-llapack/${LAPACK_LIBS}/' \ +pre-configure: + ${REINPLACE_CMD} -e '/try_lapack_LIBS=/s/-llapack/${LAPACKLIB}/' \ + -e 's/ -lxerbla//; s/-lcholmod/-lcholmod ${BLASLIB} ${LAPACKLIB} -lsuitesparseconfig/' \ ${WRKSRC}/configure .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502052251.t15MpNMP098812>