summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/cgal/package.py1
-rw-r--r--var/spack/repos/builtin/packages/expat/package.py1
-rw-r--r--var/spack/repos/builtin/packages/gdb/package.py2
-rw-r--r--var/spack/repos/builtin/packages/jdk/package.py4
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py38
-rw-r--r--var/spack/repos/builtin/packages/silo/package.py19
-rw-r--r--var/spack/repos/builtin/packages/texinfo/package.py2
-rw-r--r--var/spack/repos/builtin/packages/zfp/package.py26
8 files changed, 63 insertions, 30 deletions
diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py
index 97356433be..ef4a2736db 100644
--- a/var/spack/repos/builtin/packages/cgal/package.py
+++ b/var/spack/repos/builtin/packages/cgal/package.py
@@ -46,6 +46,7 @@ class Cgal(Package):
depends_on('mpfr')
depends_on('gmp')
depends_on('zlib')
+ depends_on('cmake')
# FIXME : Qt5 dependency missing (needs Qt5 and OpenGL)
# FIXME : Optional third party libraries missing
diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py
index 082da5bf0b..3f925c6546 100644
--- a/var/spack/repos/builtin/packages/expat/package.py
+++ b/var/spack/repos/builtin/packages/expat/package.py
@@ -7,6 +7,7 @@ class Expat(Package):
version('2.1.0', 'dd7dab7a5fea97d2a6a43f511449b7cd')
+ depends_on('cmake')
def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py
index dd02b426b9..b346fe80c2 100644
--- a/var/spack/repos/builtin/packages/gdb/package.py
+++ b/var/spack/repos/builtin/packages/gdb/package.py
@@ -6,7 +6,7 @@
# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
# LLNL-CODE-647188
#
-# For details, see https://llnl.github.io/spack
+# For details, see https://software.llnl.gov/spack
# Please also see the LICENSE file for our notice and the LGPL.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py
index f8f5fc21bd..cbcc53ac0a 100644
--- a/var/spack/repos/builtin/packages/jdk/package.py
+++ b/var/spack/repos/builtin/packages/jdk/package.py
@@ -28,7 +28,7 @@ class Jdk(Package):
'-H', # specify required License Agreement cookie
'Cookie: oraclelicense=accept-securebackup-cookie']
- def do_fetch(self):
+ def do_fetch(self, mirror_only=False):
# Add our custom curl commandline options
tty.msg(
"[Jdk] Adding required commandline options to curl " +
@@ -39,7 +39,7 @@ class Jdk(Package):
spack.curl.add_default_arg(option)
# Now perform the actual fetch
- super(Jdk, self).do_fetch()
+ super(Jdk, self).do_fetch(mirror_only)
def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index a8f19f9071..280e400f69 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Copyright (c) 2016, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory.
#
# This file is part of Spack.
@@ -34,7 +34,7 @@ class Llvm(Package):
it is the full name of the project.
"""
homepage = 'http://llvm.org/'
- url = 'http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz'
+ url = 'http://llvm.org/releases/3.7.1/llvm-3.7.1.src.tar.xz'
version('3.0', 'a8e5f5f1c1adebae7b4a654c376a6005', url='http://llvm.org/releases/3.0/llvm-3.0.tar.gz') # currently required by mesa package
@@ -133,6 +133,21 @@ class Llvm(Package):
}
},
{
+ 'version' : '3.7.1',
+ 'md5':'bf8b3a2c79e61212c5409041dfdbd319',
+ 'resources' : {
+ 'compiler-rt' : '1c6975daf30bb3b0473b53c3a1a6ff01',
+ 'openmp' : 'b4ad08cda4e5c22e42b66062b140438e',
+ 'polly' : '3a2a7367002740881637f4d47bca4dc3',
+ 'libcxx' : 'f9c43fa552a10e14ff53b94d04bea140',
+ 'libcxxabi' : '52d925afac9f97e9dcac90745255c169',
+ 'clang' : '0acd026b5529164197563d135a8fd83e',
+ 'clang-tools-extra' : '5d49ff745037f061a7c86aeb6a24c3d2',
+ 'lldb' : 'a106d8a0d21fc84d76953822fbaf3398',
+ 'llvm-libunwind' : '814bd52c9247c5d04629658fbcb3ab8c',
+ }
+ },
+ {
'version' : '3.7.0',
'md5':'b98b9495e5655a672d6cb83e1a180f8e',
'resources' : {
@@ -196,25 +211,6 @@ class Llvm(Package):
when='@%(version)s' % release,
placement=resources[name].get('placement', None))
- # SVN - current develop
- version('develop', svn='http://llvm.org/svn/llvm-project/llvm/trunk')
- resource(name='clang', svn='http://llvm.org/svn/llvm-project/cfe/trunk',
- destination='tools', when='@develop', placement='clang')
- resource(name='compiler-rt', svn='http://llvm.org/svn/llvm-project/compiler-rt/trunk',
- destination='projects', when='@develop', placement='compiler-rt')
- resource(name='openmp', svn='http://llvm.org/svn/llvm-project/openmp/trunk',
- destination='projects', when='@develop', placement='openmp')
- resource(name='libcxx', svn='http://llvm.org/svn/llvm-project/libcxx/trunk',
- destination='projects', when='@develop', placement='libcxx')
- resource(name='libcxxabi', svn='http://llvm.org/svn/llvm-project/libcxxabi/trunk',
- destination='projects', when='@develop', placement='libcxxabi')
- resource(name='polly', svn='http://llvm.org/svn/llvm-project/polly/trunk',
- destination='tools', when='@develop', placement='polly')
- resource(name='lldb', svn='http://llvm.org/svn/llvm-project/lldb/trunk',
- destination='tools', when='@develop', placement='lldb')
-
-
-
def install(self, spec, prefix):
env['CXXFLAGS'] = self.compiler.cxx11_flag
cmake_args = [ arg for arg in std_cmake_args if 'BUILD_TYPE' not in arg ]
diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py
index 9eda11df15..d1aed78e0e 100644
--- a/var/spack/repos/builtin/packages/silo/package.py
+++ b/var/spack/repos/builtin/packages/silo/package.py
@@ -1,19 +1,28 @@
from spack import *
class Silo(Package):
- """Silo is a library for reading and writing a wide variety of scientific data to binary, disk files."""
+ """Silo is a library for reading and writing a wide variety of scientific
+ data to binary, disk files."""
homepage = "http://wci.llnl.gov/simulation/computer-codes/silo"
url = "https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.8/silo-4.8.tar.gz"
- #version('4.9', 'a83eda4f06761a86726e918fc55e782a')
version('4.8', 'b1cbc0e7ec435eb656dc4b53a23663c9')
- depends_on("hdf5@:1.8.12")
+ variant('fortran', default=True, description='Enable Fortran support')
+
+ depends_on("hdf5")
def install(self, spec, prefix):
- configure("--prefix=%s" % prefix,
- "--with-hdf5=%s" %spec['hdf5'].prefix)
+ config_args = [
+ '--enable-fortran' if '+fortran' in spec else '--disable-fortran',
+ ]
+
+ configure(
+ "--prefix=%s" % prefix,
+ "--with-hdf5=%s,%s" % (spec['hdf5'].prefix.include, spec['hdf5'].prefix.lib),
+ "--with-zlib=%s,%s" % (spec['zlib'].prefix.include, spec['zlib'].prefix.lib),
+ *config_args)
make()
make("install")
diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py
index a83c10c0c1..6cf8d79072 100644
--- a/var/spack/repos/builtin/packages/texinfo/package.py
+++ b/var/spack/repos/builtin/packages/texinfo/package.py
@@ -6,7 +6,7 @@
# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
# LLNL-CODE-647188
#
-# For details, see https://llnl.github.io/spack
+# For details, see https://software.llnl.gov/spack
# Please also see the LICENSE file for our notice and the LGPL.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/var/spack/repos/builtin/packages/zfp/package.py b/var/spack/repos/builtin/packages/zfp/package.py
new file mode 100644
index 0000000000..620fe9d456
--- /dev/null
+++ b/var/spack/repos/builtin/packages/zfp/package.py
@@ -0,0 +1,26 @@
+from spack import *
+
+class Zfp(Package):
+ """zfp is an open source C library for compressed floating-point arrays that supports
+ very high throughput read and write random acces, target error bounds or bit rates.
+ Although bit-for-bit lossless compression is not always possible, zfp is usually
+ accurate to within machine epsilon in near-lossless mode, and is often orders of
+ magnitude more accurate than other lossy compressors.
+ """
+
+ homepage = "http://computation.llnl.gov/projects/floating-point-compression"
+ url = "http://computation.llnl.gov/projects/floating-point-compression/download/zfp-0.5.0.tar.gz"
+
+ version('0.5.0', '2ab29a852e65ad85aae38925c5003654')
+
+ def install(self, spec, prefix):
+ make("shared")
+
+ # No install provided
+ mkdirp(prefix.lib)
+ mkdirp(prefix.include)
+ install('lib/libzfp.so', prefix.lib)
+ install('inc/zfp.h', prefix.include)
+ install('inc/types.h', prefix.include)
+ install('inc/bitstream.h', prefix.include)
+ install('inc/system.h', prefix.include)