summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/spack/docs/basic_usage.rst2
-rwxr-xr-xlib/spack/env/cc2
-rw-r--r--lib/spack/spack/cmd/checksum.py13
-rw-r--r--lib/spack/spack/modules.py2
-rw-r--r--lib/spack/spack/util/web.py6
-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/llvm/package.py19
-rw-r--r--var/spack/repos/builtin/packages/silo/package.py19
9 files changed, 32 insertions, 33 deletions
diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst
index 0578f0c8db..f94ac3d2ba 100644
--- a/lib/spack/docs/basic_usage.rst
+++ b/lib/spack/docs/basic_usage.rst
@@ -896,7 +896,7 @@ Or, similarly with modules, you could type:
$ spack load mpich %gcc@4.4.7
These commands will add appropriate directories to your ``PATH``,
-``MANPATH``, and ``LD_LIBRARY_PATH``. When you no longer want to use
+``MANPATH``, ``CPATH``, and ``LD_LIBRARY_PATH``. When you no longer want to use
a package, you can type unload or unuse similarly:
.. code-block:: sh
diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index aacba996b3..a323c48124 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -130,7 +130,7 @@ if [ -z "$mode" ]; then
done
fi
-# Dump the version and exist if we're in testing mode.
+# Dump the version and exit if we're in testing mode.
if [ "$SPACK_TEST_COMMAND" = "dump-mode" ]; then
echo "$mode"
exit
diff --git a/lib/spack/spack/cmd/checksum.py b/lib/spack/spack/cmd/checksum.py
index b1ad89dbb8..c451993233 100644
--- a/lib/spack/spack/cmd/checksum.py
+++ b/lib/spack/spack/cmd/checksum.py
@@ -58,24 +58,29 @@ def get_checksums(versions, urls, **kwargs):
tty.msg("Downloading...")
hashes = []
- for i, (url, version) in enumerate(zip(urls, versions)):
+ i = 0
+ for url, version in zip(urls, versions):
stage = Stage(url)
try:
stage.fetch()
if i == 0 and first_stage_function:
first_stage_function(stage)
- hashes.append(
- spack.util.crypto.checksum(hashlib.md5, stage.archive_file))
+ hashes.append((version,
+ spack.util.crypto.checksum(hashlib.md5, stage.archive_file)))
except FailedDownloadError, e:
tty.msg("Failed to fetch %s" % url)
continue
+ except Exception, e:
+ tty.msg('Something failed on %s, skipping.\n (%s)' % (url, e))
+ continue
finally:
if not keep_stage:
stage.destroy()
+ i += 1
- return zip(versions, hashes)
+ return hashes
diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py
index c834763564..c27043db8c 100644
--- a/lib/spack/spack/modules.py
+++ b/lib/spack/spack/modules.py
@@ -33,6 +33,7 @@ number of directories to be appended to paths in the user's environment:
* /bin directories to be appended to PATH
* /lib* directories for LD_LIBRARY_PATH
+ * /include directories for CPATH
* /man* and /share/man* directories for MANPATH
* the package prefix for CMAKE_PREFIX_PATH
@@ -121,6 +122,7 @@ class EnvModule(object):
('LIBRARY_PATH', self.spec.prefix.lib64),
('LD_LIBRARY_PATH', self.spec.prefix.lib),
('LD_LIBRARY_PATH', self.spec.prefix.lib64),
+ ('CPATH', self.spec.prefix.include),
('PKG_CONFIG_PATH', join_path(self.spec.prefix.lib, 'pkgconfig')),
('PKG_CONFIG_PATH', join_path(self.spec.prefix.lib64, 'pkgconfig'))]:
diff --git a/lib/spack/spack/util/web.py b/lib/spack/spack/util/web.py
index e26daef296..73f4858b02 100644
--- a/lib/spack/spack/util/web.py
+++ b/lib/spack/spack/util/web.py
@@ -86,12 +86,12 @@ def _spider(args):
if not "Content-type" in resp.headers:
tty.debug("ignoring page " + url)
- return pages
+ return pages, links
if not resp.headers["Content-type"].startswith('text/html'):
tty.debug("ignoring page " + url + " with content type " +
resp.headers["Content-type"])
- return pages
+ return pages, links
# Do the real GET request when we know it's just HTML.
req.get_method = lambda: "GET"
@@ -173,7 +173,7 @@ def spider(root_url, **kwargs):
performance over a sequential fetch.
"""
max_depth = kwargs.setdefault('depth', 1)
- pages, links = _spider((root_url, set(), root_url, None, 1, max_depth, False))
+ pages, links = _spider((root_url, set(), root_url, None, 1, max_depth, False))
return pages, links
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/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index a8f19f9071..934d994bd3 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -196,25 +196,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")
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-29 14:27:40 +0000