From owner-svn-ports-head@FreeBSD.ORG Sat Jan 10 15:33:27 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F713BDA; Sat, 10 Jan 2015 15:33:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 713E3E3; Sat, 10 Jan 2015 15:33:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0AFXRT7004138; Sat, 10 Jan 2015 15:33:27 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0AFXRPb004137; Sat, 10 Jan 2015 15:33:27 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201501101533.t0AFXRPb004137@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sat, 10 Jan 2015 15:33:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376713 - head/science/ncs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jan 2015 15:33:27 -0000 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 +.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 - -.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 +.include