From a5d872f510aa460ac7f665332c3ef4d4db781e8b Mon Sep 17 00:00:00 2001 From: Yuanqi Wang <21102457+plasmas@users.noreply.github.com> Date: Wed, 4 Dec 2019 00:31:00 +0800 Subject: Update MrBayes to 3.2.7a and correct MPI variants (#13929) * Update MrBayes and correct MPI variant * Use tarballs and remove autotools dependencies * MrBayes: remove ISA variants --- .../repos/builtin/packages/mrbayes/package.py | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/mrbayes/package.py b/var/spack/repos/builtin/packages/mrbayes/package.py index 930bc04af9..ec02498e94 100644 --- a/var/spack/repos/builtin/packages/mrbayes/package.py +++ b/var/spack/repos/builtin/packages/mrbayes/package.py @@ -13,21 +13,18 @@ class Mrbayes(AutotoolsPackage): of model parameters.""" homepage = "http://mrbayes.sourceforge.net" - git = "https://github.com/NBISweden/MrBayes.git" + url = "https://github.com/NBISweden/MrBayes/releases/download/v3.2.7a/mrbayes-3.2.7a.tar.gz" - version('2017-11-22', commit='8a9adb11bcc538cb95d91d57568dff383f924503') + version('3.2.7a', sha256='1a4670be84e6b968d59382328294db4c8ceb73e0c19c702265deec6f2177815c') + version('3.2.7', sha256='39d9eb269969b501268d5c27f77687c6eaa2c71ccf15c724e6f330fc405f24b9') variant('mpi', default=True, description='Enable MPI parallel support') variant('beagle', default=True, description='Enable BEAGLE library for speed benefits') - variant('sse', default=True, description='Enable SSE in order to substantially speed up execution') - - depends_on('autoconf', type='build') - depends_on('automake', type='build') - depends_on('libtool', type='build') - depends_on('m4', type='build') + variant('readline', default=False, description='Enable readline library, not recommended with MPI') depends_on('libbeagle', when='+beagle') depends_on('mpi', when='+mpi') + depends_on('readline', when='+readline') def configure_args(self): args = [] @@ -35,14 +32,14 @@ class Mrbayes(AutotoolsPackage): args.append('--with-beagle=no') else: args.append('--with-beagle=%s' % self.spec['libbeagle'].prefix) - if '~sse' in self.spec: - args.append('--enable-sse=no') + if '+readline' in self.spec: + args.append('--with-readline=yes') else: - args.append('--enable-sse=yes') + args.append('--with-readline=no') if '~mpi' in self.spec: - args.append('--enable-mpi=no') + args.append('--with-mpi=no') else: - args.append('--enable-mpi=yes') + args.append('--with-mpi=yes') return args def install(self, spec, prefix): -- cgit v1.2.3-70-g09d2