From 6df9e8ff12aa431579b4c6e9bc1d0b8dbb82e70d Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 22 Apr 2019 17:37:56 +0000 Subject: [PATCH] math/ceres-solver: drop GCC RPATH after r499061 USES=fortran was used to ensure linking against libceres picks up correct libgcc_s to satisfy dependencies e.g., suitesparse, *blas. --- graphics/colmap/Makefile | 2 +- math/ceres-solver/Makefile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/graphics/colmap/Makefile b/graphics/colmap/Makefile index 59520837b143..38dfcd56b122 100644 --- a/graphics/colmap/Makefile +++ b/graphics/colmap/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libfreeimage.so:graphics/freeimage \ libceres.so:math/ceres-solver -USES= cmake compiler:${OPENMP}c++11-lib eigen:3 fortran localbase qt:5 sqlite +USES= cmake compiler:${OPENMP}c++11-lib eigen:3 localbase qt:5 sqlite USE_GITHUB= yes USE_GL= gl glew USE_QT= qmake_build buildtools_build core gui opengl_build widgets diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index 82962dd90e35..3f6890b50b35 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -68,9 +68,7 @@ TEST_TEST_TARGET= test ARGS="-V" 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