diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/bash/package.py | 9 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/mpibash/package.py | 31 |
2 files changed, 20 insertions, 20 deletions
diff --git a/var/spack/repos/builtin/packages/bash/package.py b/var/spack/repos/builtin/packages/bash/package.py index 478edccd99..0ee757b2bd 100644 --- a/var/spack/repos/builtin/packages/bash/package.py +++ b/var/spack/repos/builtin/packages/bash/package.py @@ -49,3 +49,12 @@ class Bash(AutotoolsPackage): def check(self): make('tests') + + @property + def install_targets(self): + args = ['install'] + + if self.spec.satisfies('@4.4:'): + args.append('install-headers') + + return args diff --git a/var/spack/repos/builtin/packages/mpibash/package.py b/var/spack/repos/builtin/packages/mpibash/package.py index f5476328b7..bc89ed5563 100644 --- a/var/spack/repos/builtin/packages/mpibash/package.py +++ b/var/spack/repos/builtin/packages/mpibash/package.py @@ -25,32 +25,23 @@ from spack import * -class Mpibash(Package): +class Mpibash(AutotoolsPackage): """Parallel scripting right from the Bourne-Again Shell (Bash)""" - homepage = "http://www.ccs3.lanl.gov/~pakin/software/mpibash-4.3.html" - version('4.3', '81348932d5da294953e15d4814c74dd1', - url="http://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz") + homepage = "https://github.com/lanl/MPI-Bash" + url = "https://github.com/lanl/MPI-Bash/releases/download/v1.2/mpibash-1.2.tar.gz" - # patch -p1 < ../mpibash-4.3.patch - patch('mpibash-4.3.patch', level=1, when='@4.3') - - # above patch modifies configure.ac - depends_on('autoconf', type='build') + version('1.2', 'b81001fb234ed79c4e5bf2f7efee3529') + depends_on('bash@4.4:') # uses MPI_Exscan which is in MPI-1.2 and later depends_on('mpi@1.2:') depends_on('libcircle') - def install(self, spec, prefix): - # run autoconf to rebuild configure - autoconf = which('autoconf') - autoconf() - - configure("--prefix=" + prefix, - "CC=mpicc") - - make(parallel=False) - - make("install") + def configure_args(self): + args = [ + "--with-bashdir={0}".format(self.spec['bash'].prefix.include.bash), + "CC={0}".format(self.spec['mpi'].mpicc) + ] + return args |