summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-02-02 18:43:21 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-02-03 12:34:49 +0100
commit9ffb6aa4dfee23b64241c4637a707f09daabcf11 (patch)
tree718a5646850d5c48e3c3076fc29ab589ff701705
parent3672072ed9ab4ff360c82aa2e83d8dc6e4dab71f (diff)
downloadscientific-9ffb6aa4dfee23b64241c4637a707f09daabcf11.tar.gz
scientific-9ffb6aa4dfee23b64241c4637a707f09daabcf11.tar.xz
eigen: version bump to 3.3.2
Change-Id: Ic072310b073f1507ef84918014bd52d8068e69e4 Reviewed-on: https://galileo.mailstation.de/gerrit/8217 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/sci-libs/eigen/eigen-3.3.2.exheres-0 (renamed from packages/sci-libs/eigen/eigen-3.3.0.exheres-0)0
-rw-r--r--packages/sci-libs/eigen/eigen.exlib20
-rw-r--r--packages/sci-libs/eigen/files/eigen-3.3.0-compile-fix.patch31
3 files changed, 5 insertions, 46 deletions
diff --git a/packages/sci-libs/eigen/eigen-3.3.0.exheres-0 b/packages/sci-libs/eigen/eigen-3.3.2.exheres-0
index c19436e..c19436e 100644
--- a/packages/sci-libs/eigen/eigen-3.3.0.exheres-0
+++ b/packages/sci-libs/eigen/eigen-3.3.2.exheres-0
diff --git a/packages/sci-libs/eigen/eigen.exlib b/packages/sci-libs/eigen/eigen.exlib
index d8cc363..6114b9b 100644
--- a/packages/sci-libs/eigen/eigen.exlib
+++ b/packages/sci-libs/eigen/eigen.exlib
@@ -39,30 +39,20 @@ DEPENDENCIES="
"
CMAKE_SRC_CONFIGURE_PARAMS=(
+ -DBUILD_TESTING:BOOL=TRUE
+ -DCMAKE_BUILD_TYPE:STRING=release
# benchmarks have extra dependencies
-DEIGEN_BUILD_BTL:BOOL=FALSE
- # demos have extra dependencies
- -DEIGEN_BUILD_DEMOS:BOOL=FALSE
- # library causes compilation hangup
- -DEIGEN_BUILD_LIB:BOOL=FALSE
-DEIGEN_BUILD_PKGCONFIG:BOOL=TRUE
- -DEIGEN_BUILD_TESTS:BOOL=TRUE
- -DEIGEN_TEST_NOQT:BOOL=TRUE
- -DEIGEN_TEST_NO_FORTRAN:BOOL=TRUE
-)
-
-CMAKE_SRC_CONFIGURE_PARAMS+=(
- -DCMAKE_BUILD_TYPE:STRING=release
- -DBUILD_TESTING:BOOL=TRUE
-DEIGEN_SPLIT_LARGE_TESTS:BOOL=TRUE
+ -DEIGEN_TEST_NOQT:BOOL=TRUE
-DEIGEN_TEST_NO_OPENGL:BOOL=TRUE
+ -DPKGCONFIG_INSTALL_DIR:PATH=/usr/$(exhost --target)/lib/pkgconfig
)
-MY_HGREV="26667be4f70b"
+MY_HGREV="da9b4e14c255"
CMAKE_SOURCE=${WORKBASE}/${PN}-${PN}-${MY_HGREV}
-DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-compile-fix.patch )
-
eigen_src_test() {
# "make test" won't build the test binaries, we have to use "make check"
emake check
diff --git a/packages/sci-libs/eigen/files/eigen-3.3.0-compile-fix.patch b/packages/sci-libs/eigen/files/eigen-3.3.0-compile-fix.patch
deleted file mode 100644
index 96d1d76..0000000
--- a/packages/sci-libs/eigen/files/eigen-3.3.0-compile-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Reason: Fixes a compile error
-Upstream: See https://bitbucket.org/eigen/eigen/pull-requests/248/make-sure-not-to-call-numext-maxi-on/diff
-
-# HG changeset patch
-# User Niels Ole Salscheider <niels_ole@salscheider-online.de>
-# Date 1478949657 -3600
-# Node ID 5f1a3dcc6054289b269b8e38b2e09ee142d20a39
-# Parent 13ee053f74aff786af558e33873ae7cedbf45653
-Make sure not to call numext::maxi on expression templates
-
-diff --git a/Eigen/src/SVD/JacobiSVD.h b/Eigen/src/SVD/JacobiSVD.h
---- a/Eigen/src/SVD/JacobiSVD.h
-+++ b/Eigen/src/SVD/JacobiSVD.h
-@@ -412,7 +412,7 @@
- }
-
- // update largest diagonal entry
-- maxDiagEntry = numext::maxi(maxDiagEntry,numext::maxi(abs(work_matrix.coeff(p,p)), abs(work_matrix.coeff(q,q))));
-+ maxDiagEntry = numext::maxi<RealScalar>(maxDiagEntry,numext::maxi<RealScalar>(abs(work_matrix.coeff(p,p)), abs(work_matrix.coeff(q,q))));
- // and check whether the 2x2 block is already diagonal
- RealScalar threshold = numext::maxi<RealScalar>(considerAsZero, precision * maxDiagEntry);
- return abs(work_matrix.coeff(p,q))>threshold || abs(work_matrix.coeff(q,p)) > threshold;
-@@ -725,7 +725,7 @@
- if(computeV()) m_matrixV.applyOnTheRight(p,q,j_right);
-
- // keep track of the largest diagonal coefficient
-- maxDiagEntry = numext::maxi<RealScalar>(maxDiagEntry,numext::maxi(abs(m_workMatrix.coeff(p,p)), abs(m_workMatrix.coeff(q,q))));
-+ maxDiagEntry = numext::maxi<RealScalar>(maxDiagEntry,numext::maxi<RealScalar>(abs(m_workMatrix.coeff(p,p)), abs(m_workMatrix.coeff(q,q))));
- }
- }
- }