From 25129d4a3b300a157f25d9c7097e9740c31e931d Mon Sep 17 00:00:00 2001 From: Lukasz Date: Wed, 26 Dec 2018 22:18:32 +0000 Subject: [PATCH] fix moab installation for version 5.0.2 removed from ftp (#10201) * moab install from git repository, fix version 5.0.2 removed from ftp server * add moab dependencies above verson 5.0.1 --- var/spack/repos/builtin/packages/moab/package.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/moab/package.py b/var/spack/repos/builtin/packages/moab/package.py index 3f8b16a568..b21a37327d 100644 --- a/var/spack/repos/builtin/packages/moab/package.py +++ b/var/spack/repos/builtin/packages/moab/package.py @@ -17,9 +17,15 @@ class Moab(AutotoolsPackage): versatile enough to support individual entity access.""" homepage = "https://bitbucket.org/fathomteam/moab" + git = "https://bitbucket.org/fathomteam/moab.git" url = "http://ftp.mcs.anl.gov/pub/fathom/moab-5.0.0.tar.gz" - version('5.0.2', '00a6f96f2e6591ab087548839fa3825e') + version('develop', branch='develop') + version('master', branch='master') + # Version 5.0.2 disappeared from FTP server. Instead set temporary version + # of MoAB to 5.0.2 set to current head of the master branch. + version('5.0.2', commit='01d05b1805236ef44da36f67eb2701095f2e33c7') + version('5.0.1', commit='6cc12bd4ae3fa7c9ad81c595e4d38fa84f0884be') version('5.0.0', '1840ca02366f4d3237d44af63e239e3b') version('4.9.2', '540931a604c180bbd3c1bb3ee8c51dd0') version('4.9.1', '19cc2189fa266181ad9109b18d0b2ab8') @@ -62,6 +68,10 @@ class Moab(AutotoolsPackage): # depends_on('cgns', when='+cgns') # depends_on('vtk', when='+vtk') + depends_on('autoconf', type='build', when='@master,5.0.1:') + depends_on('automake', type='build', when='@master,5.0.1:') + depends_on('libtool', type='build', when='@master,5.0.1:') + depends_on('m4', type='build', when='@master,5.0.1:') depends_on('blas') depends_on('lapack') depends_on('mpi', when='+mpi')