summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/packages/jpeg/package.py2
-rw-r--r--var/spack/packages/openmpi/package.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/var/spack/packages/jpeg/package.py b/var/spack/packages/jpeg/package.py
index b34fd5cb2d..bb5b77e01c 100644
--- a/var/spack/packages/jpeg/package.py
+++ b/var/spack/packages/jpeg/package.py
@@ -5,7 +5,7 @@ class Jpeg(Package):
homepage = "http://www.ijg.org"
url = "http://www.ijg.org/files/jpegsrc.v9a.tar.gz"
- version('9', 'b397211ddfd506b92cd5e02a22ac924d')
+ version('9a', 'b397211ddfd506b92cd5e02a22ac924d')
def install(self, spec, prefix):
configure("--prefix=%s" % prefix)
diff --git a/var/spack/packages/openmpi/package.py b/var/spack/packages/openmpi/package.py
index 1ef8a8f000..7e84cbaf65 100644
--- a/var/spack/packages/openmpi/package.py
+++ b/var/spack/packages/openmpi/package.py
@@ -13,9 +13,9 @@ class Openmpi(Package):
version('1.8.2', 'ab538ed8e328079d566fc797792e016e',
url='http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.2.tar.gz')
-
version('1.6.5', '03aed2a4aa4d0b27196962a2a65fc475',
url = "http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2")
+
patch('ad_lustre_rwcontig_open_source.patch', when="@1.6.5")
patch('llnl-platforms.patch', when="@1.6.5")
@@ -27,8 +27,8 @@ class Openmpi(Package):
# 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"
- if self.version == ver("1.6.5"):
- confg_args.append("--with-platform=contrib/platform/lanl/tlcc2/optimized-nopanasas")
+ if self.version == ver("1.6.5") and '+lanl' in spec:
+ config_args.append("--with-platform=contrib/platform/lanl/tlcc2/optimized-nopanasas")
# TODO: Spack should make it so that you can't actually find
# these compilers if they're "disabled" for the current