diff options
| author | Christoph Junghans <christoph.junghans@gmail.com> | 2017-10-16 10:59:41 -0600 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-10-16 09:59:41 -0700 |
| commit | 89344ebd44932a2f3a30dd91684f0a79bfce11ea (patch) | |
| tree | 9515d87a4fcfa93fa0e8710144b3cc520972393f | |
| parent | d0cf3db46e708497f5c8970d9e3f9b1787a93da4 (diff) | |
| download | spack-89344ebd44932a2f3a30dd91684f0a79bfce11ea.tar.gz spack-89344ebd44932a2f3a30dd91684f0a79bfce11ea.tar.bz2 spack-89344ebd44932a2f3a30dd91684f0a79bfce11ea.tar.xz spack-89344ebd44932a2f3a30dd91684f0a79bfce11ea.zip | |
portage: fixes + added v1.1.* (#5706)
| -rw-r--r-- | var/spack/repos/builtin/packages/portage/package.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/portage/package.py b/var/spack/repos/builtin/packages/portage/package.py index 0934076ab9..3b9794a959 100644 --- a/var/spack/repos/builtin/packages/portage/package.py +++ b/var/spack/repos/builtin/packages/portage/package.py @@ -34,12 +34,16 @@ class Portage(CMakePackage): homepage = "http://portage.lanl.gov/" url = "https://github.com/laristra/portage/tarball/v1.0" + # tarballs don't have submodules, so use git tags + version('1.1.1', git='https://github.com/laristra/portage', tag='v1.1.1', submodules=True) + version('1.1.0', git='https://github.com/laristra/portage', tag='v1.1.0', submodules=True) version('develop', git='https://github.com/laristra/portage', branch='master', submodules=True) variant('mpi', default=True, description='Support MPI') depends_on("cmake@3.1:", type='build') depends_on('mpi', when='+mpi') + depends_on('lapack') def cmake_args(self): options = ['-DENABLE_UNIT_TESTS=ON', '-DENABLE_APP_TESTS=ON'] @@ -47,7 +51,9 @@ class Portage(CMakePackage): if '+mpi' in self.spec: options.extend([ '-DENABLE_MPI=ON', - '-DENABLE_MPI_CXX_BINDINGS=ON' + '-DENABLE_MPI_CXX_BINDINGS=ON', + '-DCMAKE_CXX_COMPILER=%s' % self.spec['mpi'].mpicxx, + '-DCMAKE_C_COMPILER=%s' % self.spec['mpi'].mpicc, ]) else: options.append('-DENABLE_MPI=OFF') |