summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Flood <neilflood@fastmail.fm>2018-07-27 08:47:18 +1000
committerAdam J. Stewart <ajstewart426@gmail.com>2018-07-26 17:47:18 -0500
commit3494c6e403b05c4c2f097d996671c63e3ca8a0b2 (patch)
treee69c3131e14a195d1717b2da94fb9dba8a81fe29
parentbf2c232756a0c44cf5d21a9a4bf6222296fc5f2f (diff)
downloadspack-3494c6e403b05c4c2f097d996671c63e3ca8a0b2.tar.gz
spack-3494c6e403b05c4c2f097d996671c63e3ca8a0b2.tar.bz2
spack-3494c6e403b05c4c2f097d996671c63e3ca8a0b2.tar.xz
spack-3494c6e403b05c4c2f097d996671c63e3ca8a0b2.zip
Updated llvm to version 6.0.1. The previous 6.0.0 had an incorrectly … (#8801)
* Updated llvm to version 6.0.1. The previous 6.0.0 had an incorrectly declared symbol, discussed at https://reviews.llvm.org/D44140, which, amongst other things, broke py-numba. This version works fine with py-numba. * Flag the conflict between py-numba and llvm@6.0.0 * Removed a single trailing space to satisfy checks
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py16
-rw-r--r--var/spack/repos/builtin/packages/py-numba/package.py4
2 files changed, 20 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index 8d5d2a6ec8..f2f03ad28b 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -181,6 +181,22 @@ class Llvm(CMakePackage):
}
},
{
+ 'version': '6.0.1',
+ 'md5': 'c88c98709300ce2c285391f387fecce0',
+ 'resources': {
+ 'compiler-rt': '99bf8bcb68ba96dda74f6aee6c55f639',
+ 'openmp': '4826402ae3633c36c51ba4d0e5527d30',
+ 'polly': '4e5937753d1f77e2c0feca485fc7f9da',
+ 'libcxx': '2c13cd0136ab6f8060a4cde85b5f86e2',
+ 'libcxxabi': '41764959176d5fcc7baee8cd22ed1705',
+ 'cfe': '4e419bd4e3b55aa06d872320f754bd85',
+ 'clang-tools-extra': '431cba2b652e9c227a59a6d681388160',
+ 'lldb': '482eba39e78c75a83216cf2d5b7a54b4',
+ 'lld': '31cc580b32be124972c40c19c0839fed',
+ 'libunwind': '569eed6f508af4c4c053b1112e6f3d0b'
+ }
+ },
+ {
'version': '6.0.0',
'md5': '788a11a35fa62eb008019b37187d09d2',
'resources': {
diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py
index 45091118ca..7b10e3aa25 100644
--- a/var/spack/repos/builtin/packages/py-numba/package.py
+++ b/var/spack/repos/builtin/packages/py-numba/package.py
@@ -38,3 +38,7 @@ class PyNumba(PythonPackage):
depends_on('py-argparse', type=('build', 'run'))
depends_on('py-funcsigs', type=('build', 'run'), when='^python@:3.3.99')
depends_on('py-singledispatch', type=('build', 'run'), when='^python@:3.3.99')
+
+ # Version 6.0.0 of llvm had a hidden symbol which breaks numba at runtime.
+ # See https://reviews.llvm.org/D44140
+ conflicts('^llvm@6.0.0')