summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorDenis Davydov <davydden@gmail.com>2016-05-17 22:57:32 +0200
committerDenis Davydov <davydden@gmail.com>2016-05-17 22:57:32 +0200
commit1a187e73ae51e40c1e9bc6eea8aaf8f9e60ffd3f (patch)
tree527275fe3fd5a9e00fe10050691424aa2bbe2de3 /var
parent1774c7a7b38fa60eaf30aa9d5cef5a6a18b8c55d (diff)
downloadspack-1a187e73ae51e40c1e9bc6eea8aaf8f9e60ffd3f.tar.gz
spack-1a187e73ae51e40c1e9bc6eea8aaf8f9e60ffd3f.tar.bz2
spack-1a187e73ae51e40c1e9bc6eea8aaf8f9e60ffd3f.tar.xz
spack-1a187e73ae51e40c1e9bc6eea8aaf8f9e60ffd3f.zip
tbb: add 4.4.4; raise InstallError when building 4.4.3 with GCC6.1
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/tbb/package.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/tbb/package.py b/var/spack/repos/builtin/packages/tbb/package.py
index 6c3ceb1e76..14e1b3d3b5 100644
--- a/var/spack/repos/builtin/packages/tbb/package.py
+++ b/var/spack/repos/builtin/packages/tbb/package.py
@@ -35,6 +35,7 @@ class Tbb(Package):
homepage = "http://www.threadingbuildingblocks.org/"
# Only version-specific URL's work for TBB
+ version('4.4.4', 'd4cee5e4ca75cab5181834877738619c56afeb71', url='https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20160413oss_src.tgz')
version('4.4.3', '80707e277f69d9b20eeebdd7a5f5331137868ce1', url='https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20160128oss_src_0.tgz')
def coerce_to_spack(self,tbb_build_subdir):
@@ -54,8 +55,10 @@ class Tbb(Package):
of.write(l);
def install(self, spec, prefix):
- #
- # we need to follow TBB's compiler selection logic to get the proper build + link flags
+ if spec.satisfies('%gcc@6.1:') and spec.satisfies('@:4.4.3'):
+ raise InstallError('Only TBB 4.4.4 and above build with GCC 6.1!')
+
+ # We need to follow TBB's compiler selection logic to get the proper build + link flags
# but we still need to use spack's compiler wrappers
# to accomplish this, we do two things:
#