summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2018-03-22 07:25:26 -0500
committerGitHub <noreply@github.com>2018-03-22 07:25:26 -0500
commitaa84ddffed1fe421a26c4169ae94540beae8def1 (patch)
treedb2256a2aa192d9b3563eebd110a6bd96d53589b
parente71681458bef2c89415dbc97226d05d5e61bd86b (diff)
downloadspack-aa84ddffed1fe421a26c4169ae94540beae8def1.tar.gz
spack-aa84ddffed1fe421a26c4169ae94540beae8def1.tar.bz2
spack-aa84ddffed1fe421a26c4169ae94540beae8def1.tar.xz
spack-aa84ddffed1fe421a26c4169ae94540beae8def1.zip
Add latest version of eigen (#7530)
* Add latest version of eigen * Fix bug in ptscotch detection
-rw-r--r--var/spack/repos/builtin/packages/eigen/find-ptscotch.patch27
-rw-r--r--var/spack/repos/builtin/packages/eigen/package.py5
2 files changed, 31 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/eigen/find-ptscotch.patch b/var/spack/repos/builtin/packages/eigen/find-ptscotch.patch
new file mode 100644
index 0000000000..4f6e286b72
--- /dev/null
+++ b/var/spack/repos/builtin/packages/eigen/find-ptscotch.patch
@@ -0,0 +1,27 @@
+Version 3.3.4 contained a bug that prevented it from finding scotch~mpi.
+
+diff --git a/tmp/FindPTSCOTCH.cmake b/cmake/FindPTSCOTCH.cmake
+index 1396d05..23451b1 100644
+--- a/tmp/FindPTSCOTCH.cmake
++++ b/cmake/FindPTSCOTCH.cmake
+@@ -167,11 +167,11 @@ endif()
+
+ # If found, add path to cmake variable
+ # ------------------------------------
++unset(PTSCOTCH_INCLUDE_DIRS)
+ foreach(ptscotch_hdr ${PTSCOTCH_hdrs_to_find})
+ if (PTSCOTCH_${ptscotch_hdr}_DIRS)
+ list(APPEND PTSCOTCH_INCLUDE_DIRS "${PTSCOTCH_${ptscotch_hdr}_DIRS}")
+ else ()
+- set(PTSCOTCH_INCLUDE_DIRS "PTSCOTCH_INCLUDE_DIRS-NOTFOUND")
+ if (NOT PTSCOTCH_FIND_QUIETLY)
+ message(STATUS "Looking for ptscotch -- ${ptscotch_hdr} not found")
+ endif()
+@@ -255,7 +255,6 @@ foreach(ptscotch_lib ${PTSCOTCH_libs_to_find})
+ list(APPEND PTSCOTCH_LIBRARIES "${PTSCOTCH_${ptscotch_lib}_LIBRARY}")
+ list(APPEND PTSCOTCH_LIBRARY_DIRS "${${ptscotch_lib}_lib_path}")
+ else ()
+- list(APPEND PTSCOTCH_LIBRARIES "${PTSCOTCH_${ptscotch_lib}_LIBRARY}")
+ if (NOT PTSCOTCH_FIND_QUIETLY)
+ message(STATUS "Looking for ptscotch -- lib ${ptscotch_lib} not found")
+ endif()
diff --git a/var/spack/repos/builtin/packages/eigen/package.py b/var/spack/repos/builtin/packages/eigen/package.py
index 9e7d8c392e..0c820ec671 100644
--- a/var/spack/repos/builtin/packages/eigen/package.py
+++ b/var/spack/repos/builtin/packages/eigen/package.py
@@ -31,8 +31,9 @@ class Eigen(CMakePackage):
"""
homepage = 'http://eigen.tuxfamily.org/'
- url = 'https://bitbucket.org/eigen/eigen/get/3.3.3.tar.bz2'
+ url = 'https://bitbucket.org/eigen/eigen/get/3.3.4.tar.bz2'
+ version('3.3.4', 'a7aab9f758249b86c93221ad417fbe18')
version('3.3.3', 'b2ddade41040d9cf73b39b4b51e8775b')
version('3.3.1', 'edb6799ef413b0868aace20d2403864c')
version('3.2.10', 'a85bb68c82988648c3d53ba9768d7dcbcfe105f8')
@@ -58,3 +59,5 @@ class Eigen(CMakePackage):
depends_on('suite-sparse', when='+suitesparse')
depends_on('mpfr@2.3.0:', when='+mpfr')
depends_on('gmp', when='+mpfr')
+
+ patch('find-ptscotch.patch', when='@3.3.4')