diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-11-18 15:57:56 -0600 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-11-18 15:57:56 -0600 |
| commit | 89c11221ed448a2d775af3abe0ec6cf7f4cfb093 (patch) | |
| tree | 9d429cb5729e2b31ddd4a6e4ee61f8945a56f873 /var | |
| parent | 025566b4946b7adb3731a27a20b4d5cb6fda6c55 (diff) | |
| parent | e36fd7d29f3b2726c77ca6028135ca6d93376cae (diff) | |
| download | spack-89c11221ed448a2d775af3abe0ec6cf7f4cfb093.tar.gz spack-89c11221ed448a2d775af3abe0ec6cf7f4cfb093.tar.bz2 spack-89c11221ed448a2d775af3abe0ec6cf7f4cfb093.tar.xz spack-89c11221ed448a2d775af3abe0ec6cf7f4cfb093.zip | |
Merge pull request #181 from eschnett/update-openmpi
Update OpenMPI to 1.10.1; correct configure error in OpenMPI
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/packages/openmpi/configure.patch | 31 | ||||
| -rw-r--r-- | var/spack/packages/openmpi/package.py | 9 |
2 files changed, 40 insertions, 0 deletions
diff --git a/var/spack/packages/openmpi/configure.patch b/var/spack/packages/openmpi/configure.patch new file mode 100644 index 0000000000..18fb42c1d1 --- /dev/null +++ b/var/spack/packages/openmpi/configure.patch @@ -0,0 +1,31 @@ +This patch addresses <https://github.com/open-mpi/ompi/issues/576>. +--- a/configure ++++ b/configure +@@ -301130,10 +301130,11 @@ + case ${prev}${p} in + + -L* | -R* | -l*) +- # Some compilers place space between "-{L,R}" and the path. ++ # Some compilers place space between "-{L,R,l}" and the path. + # Remove the space. + if test $p = "-L" || +- test $p = "-R"; then ++ test $p = "-R" || ++ test $p = "-l"; then + prev=$p + continue + fi +@@ -303036,10 +303037,11 @@ + case ${prev}${p} in + + -L* | -R* | -l*) +- # Some compilers place space between "-{L,R}" and the path. ++ # Some compilers place space between "-{L,R,l}" and the path. + # Remove the space. + if test $p = "-L" || +- test $p = "-R"; then ++ test $p = "-R" || ++ test $p = "-l"; then + prev=$p + continue + fi diff --git a/var/spack/packages/openmpi/package.py b/var/spack/packages/openmpi/package.py index 5e429dedf5..be2202fbbd 100644 --- a/var/spack/packages/openmpi/package.py +++ b/var/spack/packages/openmpi/package.py @@ -14,6 +14,8 @@ class Openmpi(Package): homepage = "http://www.open-mpi.org" + version('1.10.1', 'f0fcd77ed345b7eafb431968124ba16e', + url = "http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.1.tar.bz2") version('1.10.0', '280cf952de68369cebaca886c5ce0304', url = "http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.0.tar.bz2") version('1.8.8', '0dab8e602372da1425e9242ae37faf8c', @@ -23,10 +25,15 @@ class Openmpi(Package): patch('ad_lustre_rwcontig_open_source.patch', when="@1.6.5") patch('llnl-platforms.patch', when="@1.6.5") + patch('configure.patch', when="@1.10.0:") provides('mpi@:2.2', when='@1.6.5') # Open MPI 1.6.5 supports MPI-2.2 provides('mpi@:3.0', when='@1.8.8') # Open MPI 1.8.8 supports MPI-3.0 provides('mpi@:3.0', when='@1.10.0') # Open MPI 1.10.0 supports MPI-3.0 + provides('mpi@:3.0', when='@1.10.1') # Open MPI 1.10.1 supports MPI-3.0 + + + depends_on('hwloc') def setup_dependent_environment(self, module, spec, dep_spec): @@ -40,6 +47,8 @@ class Openmpi(Package): def install(self, spec, prefix): config_args = ["--prefix=%s" % prefix] + config_args.append("--with-hwloc=%s" % spec['hwloc'].prefix) + # TODO: use variants for this, e.g. +lanl, +llnl, etc. # use this for LANL builds, but for LLNL builds, we need: # "--with-platform=contrib/platform/llnl/optimized" |