From owner-svn-ports-all@freebsd.org Tue May 15 21:01:26 2018 Return-Path: Delivered-To: svn-ports-all@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 006FFEAEDF2; Tue, 15 May 2018 21:01:26 +0000 (UTC) (envelope-from jbeich@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 A2A53807D6; Tue, 15 May 2018 21:01:25 +0000 (UTC) (envelope-from jbeich@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 83CC610B13; Tue, 15 May 2018 21:01:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4FL1Pl0094064; Tue, 15 May 2018 21:01:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4FL1PrL093667; Tue, 15 May 2018 21:01:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805152101.w4FL1PrL093667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 15 May 2018 21:01:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r470058 - in branches/2018Q2/math/ceres-solver: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/math/ceres-solver: . files X-SVN-Commit-Revision: 470058 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2018 21:01:26 -0000 Author: jbeich Date: Tue May 15 21:01:24 2018 New Revision: 470058 URL: https://svnweb.freebsd.org/changeset/ports/470058 Log: MFH: r470051 r470052 r470053 r470054 r470055 r470056 math/ceres-solver: fix LAPACK options after r465552/r465553 - NETLIB used wrong library - OPENBLAS was nop - ATLAS didn't build Approved by: ports-secteam blanket Added: branches/2018Q2/math/ceres-solver/files/ - copied from r470052, head/math/ceres-solver/files/ Modified: branches/2018Q2/math/ceres-solver/Makefile branches/2018Q2/math/ceres-solver/files/patch-CMakeLists.txt Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/math/ceres-solver/Makefile ============================================================================== --- branches/2018Q2/math/ceres-solver/Makefile Tue May 15 21:00:46 2018 (r470057) +++ branches/2018Q2/math/ceres-solver/Makefile Tue May 15 21:01:24 2018 (r470058) @@ -2,6 +2,7 @@ PORTNAME= ceres-solver DISTVERSION= 1.14.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= jbeich@FreeBSD.org @@ -69,19 +70,24 @@ TEST_IMPLIES= GFLAGS LAPACK_DESC= Linear Algebra PACKage LAPACK_USES= fortran # LDFLAGS LAPACK_CMAKE_BOOL= LAPACK +LAPACK_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW # USES=fortran +# Avoid conflict with Ceres threading by using single-threaded BLAS library. +# BLASLIB from USES=blaslapack cannot be used as it's multi-threaded. +# https://github.com/xianyi/OpenBLAS/wiki/faq#multi-threaded ATLAS_USES= blaslapack:atlas -ATLAS_MAKE_ENV= BLA_VENDOR=ATLAS -ATLAS_CMAKE_ON= -DLAPACK_LIBRARIES:STRING=alapack +ATLAS_CMAKE_ON= -DBLA_VENDOR:STRING="ATLAS" \ + -DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libcblas.so" \ + -DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libalapack.so" ATLAS_IMPLIES= LAPACK GOTOBLAS_DESC= Goto blas implementation GOTOBLAS_USES= blaslapack:gotoblas -GOTOBLAS_MAKE_ENV= BLA_VENDOR=Goto +GOTOBLAS_CMAKE_ON= -DBLA_VENDOR:STRING="Goto" GOTOBLAS_IMPLIES= LAPACK NETLIB_USES= blaslapack:netlib -NETLIB_MAKE_ENV= BLA_VENDOR=Generic +NETLIB_CMAKE_ON= -DBLA_VENDOR:STRING="Generic" NETLIB_IMPLIES= LAPACK OPENBLAS_USES= blaslapack:openblas -OPENBLAS_MAKE_ENV= BLA_VENDOR=OpenBLAS +OPENBLAS_CMAKE_ON= -DBLA_VENDOR:STRING="OpenBLAS" OPENBLAS_IMPLIES= LAPACK SPARSE_DESC= Sparse linear algebra library Modified: branches/2018Q2/math/ceres-solver/files/patch-CMakeLists.txt ============================================================================== --- head/math/ceres-solver/files/patch-CMakeLists.txt Tue May 15 20:42:11 2018 (r470052) +++ branches/2018Q2/math/ceres-solver/files/patch-CMakeLists.txt Tue May 15 21:01:24 2018 (r470058) @@ -7,7 +7,7 @@ https://github.com/ceres-solver/ceres-solver/issues/35 # -std=c++11 s/t we will detect the C++11 versions of unordered_map & # shared_ptr if they exist. - set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11") -+ set(CMAKE_CXX_STANDARD 11) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") endif (CXX11 AND COMPILER_HAS_CXX11_FLAG) # Set the Ceres compile definitions for the unordered_map configuration.