From owner-svn-ports-head@freebsd.org Thu Feb 8 01:13:22 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2027EEB4AA; Thu, 8 Feb 2018 01:13:21 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9E37A69483; Thu, 8 Feb 2018 01:13:21 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 993806EA0; Thu, 8 Feb 2018 01:13:21 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w181DLks052520; Thu, 8 Feb 2018 01:13:21 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w181DL7P052519; Thu, 8 Feb 2018 01:13:21 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201802080113.w181DL7P052519@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 8 Feb 2018 01:13:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461195 - head/math/coinmp X-SVN-Group: ports-head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/math/coinmp X-SVN-Commit-Revision: 461195 X-SVN-Commit-Repository: ports 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.25 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: Thu, 08 Feb 2018 01:13:22 -0000 Author: pfg (src committer) Date: Thu Feb 8 01:13:21 2018 New Revision: 461195 URL: https://svnweb.freebsd.org/changeset/ports/461195 Log: math/coinmp: Add an option for Fortran. It can be convenient for performance to enable blas/lapack, which necessarilly involves using the fortran interface. Leave it OFF by default since it can interfere with some important consumers like Apache OpenOffice. Use the standard TEST_TARGET while here. No need to bump the portversion as this doesn't affect the package. PR: 219261 Approved by: cpm Modified: head/math/coinmp/Makefile Modified: head/math/coinmp/Makefile ============================================================================== --- head/math/coinmp/Makefile Thu Feb 8 00:59:50 2018 (r461194) +++ head/math/coinmp/Makefile Thu Feb 8 01:13:21 2018 (r461195) @@ -22,14 +22,19 @@ USES= libtool pathfix pkgconfig tar:tgz USE_LDCONFIG= yes CXXFLAGS+= -ffast-math -OPTIONS_DEFINE= DEBUG DOCS GLPK +OPTIONS_DEFINE= DEBUG DOCS FORTRAN GLPK +FORTRAN_DESCR= Use BLAS/LAPACK with the fortran interface GLPK_DESC= GNU Linear Programming Kit support PORTDOCS= * DEBUG_CXXFLAGS= -fomit-frame-pointer +FORTRAN_USES= fortran blaslapack +FORTRAN_CONFIGURE_ON= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \ + --with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" + GLPK_LIB_DEPENDS= libglpk.so:math/glpk GLPK_CONFIGURE_ON= --with-gmpl-incdir=${LOCALBASE}/include \ --with-gmpl-lib="-L${LOCALBASE}/lib -lglpk" @@ -38,6 +43,9 @@ GLPK_CONFIGURE_OFF= --disable-glpk-libcheck STRIP_FILES= libCoinUtils libOsi libOsiClp libOsiCommonTests libClp libClpSolver \ libCgl libCbc libCbcSolver libOsiCbc libCoinMP +TEST_TARGET= unitTest +TEST_WRKSRC= ${WRKSRC}/${PORTNAME} + post-patch:: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ -e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \ @@ -52,9 +60,5 @@ post-install: .for filename in ${STRIP_FILES} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${filename}.so.* .endfor - -check regression-test test: build - ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ - ${MAKE_ARGS} test -C ${WRKSRC} .include