From owner-dev-commits-ports-all@freebsd.org Tue Sep 7 21:30:04 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 680AB66D2E4; Tue, 7 Sep 2021 21:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H3z241QCSz4fTg; Tue, 7 Sep 2021 21:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0398519A7F; Tue, 7 Sep 2021 21:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 187LU3qD039969; Tue, 7 Sep 2021 21:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 187LU30q039963; Tue, 7 Sep 2021 21:30:03 GMT (envelope-from git) Date: Tue, 7 Sep 2021 21:30:03 GMT Message-Id: <202109072130.187LU30q039963@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: b41385d1aad5 - main - math/eigen3: massage OPTIONs MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b41385d1aad52bf5e2e6f2bb65777e201d9e5cd7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Sep 2021 21:30:04 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=b41385d1aad52bf5e2e6f2bb65777e201d9e5cd7 commit b41385d1aad52bf5e2e6f2bb65777e201d9e5cd7 Author: Adriaan de Groot AuthorDate: 2021-09-07 08:58:27 +0000 Commit: Adriaan de Groot CommitDate: 2021-09-07 21:28:08 +0000 math/eigen3: massage OPTIONs Existing OPTIONs pull in too many dependencies -- Eigen is a template library and doesn't **need** any of the libs -- and are overly-specific, like requiring a particular BLAS implementation. PR: 257321 251842 Reported by: alt2600@icloud.com --- UPDATING | 18 ++++++++++++++++++ math/eigen3/Makefile | 16 ++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/UPDATING b/UPDATING index e8344ffec2bb..e02bc71348dd 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,24 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20210907: + AFFECTS: consumers of math/eigen[23] + AUTHOR: adridg@FreeBSD.org + + math/eigen2 has been marked deprecated. There do not seem to be any + consumers in FreeBSD ports. + + math/eigen3 has had its options re-vamped. The default options previously + pulled in multiple useless library dependencies. The options also forced + a specific BLAS implementation. The new options depend only on the + default BLAS (whatever USES=blaslapack picks), but this can be turned + off. The previous multiple useless libraries -- which are not useless + when running the tests in Eigen -- are now hidden behind the default-off + TEST option. + + Users of a carefully-tuned Eigen build should re-evaluate the options + available. + 20210902: AFFECTS: users of editors/vim AUTHOR: adamw@FreeBSD.org diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile index 712ff7e1f3a3..6d25013e6d27 100644 --- a/math/eigen3/Makefile +++ b/math/eigen3/Makefile @@ -12,17 +12,21 @@ LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL LICENSE_FILE_MPL20= ${WRKSRC}/COPYING.MPL2 CMAKE_ARGS= -DPKGCONFIG_INSTALL_DIR:PATH="libdata/pkgconfig" +# This is to set the C++ standard to C++11, instead of 03 +CMAKE_ON= EIGEN_TEST_CXX11 USES= cmake tar:bzip2 NO_BUILD= yes NO_ARCH= yes -OPTIONS_DEFINE= FULL -OPTIONS_DEFAULT=FULL +OPTIONS_DEFINE= BLAS TEST +OPTIONS_DEFAULT=BLAS -FULL_DESC= Add the support for math dependencies -FULL_CMAKE_ON= -DBLAS_DIR:PATH="${LOCALBASE}" -FULL_USES= blaslapack:openblas pkgconfig -FULL_LIB_DEPENDS= libcholmod.so:math/suitesparse-cholmod \ +BLAS_DESC= Adds math dependencies +BLAS_CMAKE_ARGS=-DBLAS_DIR:PATH="${LOCALBASE}" +BLAS_USES= blaslapack pkgconfig + +TEST_CMAKE_ON= EIGEN_TEST_CUDA EIGEN_TEST_CUDA_CLANG +TEST_LIB_DEPENDS= libcholmod.so:math/suitesparse-cholmod \ libumfpack.so:math/suitesparse-umfpack \ libsuperlu.so:math/superlu \ libadolc.so:math/adol-c \