Date: Sat, 10 Jan 2015 15:33:27 +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: r376713 - head/science/ncs Message-ID: <201501101533.t0AFXRPb004137@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sat Jan 10 15:33:26 2015 New Revision: 376713 URL: https://svnweb.freebsd.org/changeset/ports/376713 QAT: https://qat.redports.org/buildarchive/r376713/ Log: Uses blaslapack.mk. Modified: head/science/ncs/Makefile Modified: head/science/ncs/Makefile ============================================================================== --- head/science/ncs/Makefile Sat Jan 10 15:29:18 2015 (r376712) +++ head/science/ncs/Makefile Sat Jan 10 15:33:26 2015 (r376713) @@ -30,6 +30,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LO GNU_CONFIGURE= yes CONFIGURE_ENV= MPI_LIBS="${MPI_LIBS}" \ PYEXE="${PYTHON_CMD}" +CONFIGURE_ARGS= --with-blas-libs="${BLASLIB} ${LAPACKLIB}" MAKE_ENV= NOM_ARCH=${OPSYS} CS_MPI_PATH=${MPI_HOME}/bin \ PTHREAD_LIBS=${PTHREAD_LIBS} TERM=${TERM} \ MPI_HOME=${MPI_HOME} MPI_LIBS="${MPI_LIBS}" @@ -43,8 +44,24 @@ BATCH_DESC= Use Torque to submit batche BATCH_CONFIGURE_WITH= batch=PBS BATCH_LIB_DEPENDS= libtorque.so:${PORTSDIR}/sysutils/torque +OPTIONS_RADIO= BLAS +OPTIONS_RADIO_BLAS= REFERENCE ATLAS +OPTIONS_DEFAULT= REFERENCE + +REFERENCE_DESC= Blas / Lapack +REFERENCE_USES= blaslapack:netlib + +ATLAS_DESC= ATLAS +ATLAS_USES= blaslapack:atlas + .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MREFERENCE} +CONFIGURE_ARGS+= --with-blas-type=BLAS +.else +CONFIGURE_ARGS+= --with-blas-type=ATLAS +.endif + .if defined(PACKAGE_BUILDING) TERM= vt100 # Force for pointyhat to override su .else @@ -82,19 +99,6 @@ INSTALL_TARGET= install install-pdf DOCS= AUTHORS COMPATIBILITY ChangeLog README .endif -.include <bsd.port.pre.mk> - -.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) -WITH_ATLAS= yes -.endif -.if defined(WITH_ATLAS) && !defined(WITHOUT_ATLAS) -LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas -BLAS_LIB= -lf77blas -.elif !defined(WITHOUT_BLAS) -LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas -BLAS_LIB= -lblas -.endif - RUN_DEPENDS+= xpdf:${PORTSDIR}/graphics/xpdf pre-everything:: @@ -102,9 +106,6 @@ pre-everything:: @${ECHO_MSG} "By default ncs is built with MPICH2, but you can set WITH_LAM or WITH_OPENMPI" @${ECHO_MSG} "if you prefer." @${ECHO_MSG} - @${ECHO_MSG} "By default ncs is built with BLAS, unless ATLAS is installed, but you can set" - @${ECHO_MSG} "WITHOUT_BLAS or WITHOUT_ATLAS if you prefer." - @${ECHO_MSG} post-install: .if ${PORT_OPTIONS:MDOCS} @@ -116,4 +117,4 @@ post-install: cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501101533.t0AFXRPb004137>