Merge branch 'spack_v0.21.1_fix_llvm_for_bss2' into 'spack_v0.21.1'

fix(BSS): llvm variant selection changed

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!487

packages/genpybind/package.py

@@ -43,7 +43,7 @@ class Genpybind(WafPackage):
     version('ebrains', tag='ebrains_release-1-rc1', git='https://github.com/electronicvisions/genpybind')
 
     depends_on(
-            'llvm+clang+python+visionary@5.0.0:',
+            'llvm+clang+python+visionary@5.0.0: libcxx=none',
         type=('build', 'link', 'run'))
     depends_on('binutils', type='build')
     depends_on('python@2.7:', type=('build', 'run'))

packages/hxtorch/package.py

@@ -37,7 +37,6 @@ class Hxtorch(WafPackage):
     depends_on('intel-tbb', type=('build', 'link', 'run'))  # ppu gdbserver
     depends_on('libelf', type=('build', 'link', 'run'))
     depends_on('liblockfile', type=('build', 'link', 'run'))
-    depends_on('llvm', type=('build', 'link', 'run'))
     depends_on('log4cxx@0.12.1:', type=('build', 'link', 'run'))
     depends_on('pkgconfig', type=('build', 'link', 'run'))
     depends_on('psmisc', type=('run', 'test'))

packages/llvm/package.py

@@ -396,6 +396,9 @@ class Llvm(CMakePackage, CudaPackage):
             description='Force linking of all files into view, including '
                         'known conflicts (e.g. libgomp).')
 
+    conflicts("@:8", when="+visionary")
+    conflicts("@13:", when="+visionary")
+
     patch('llvm9-0001-Tooling-Fully-qualify-template-parameters-of-nested-.patch', when='@9.0.0:12.0.999 +visionary', level=2)
 
     # 0001-Tooling-Fully-qualify-template-parameters-of-nested-.patch from above

packages/pynn-brainscales/package.py

@@ -37,7 +37,6 @@ class PynnBrainscales(WafPackage):
     depends_on('intel-tbb', type=('build', 'link', 'run'))  # ppu gdbserver
     depends_on('libelf', type=('build', 'link', 'run'))
     depends_on('liblockfile', type=('build', 'link', 'run'))
-    depends_on('llvm', type=('build', 'link', 'run'))
     depends_on('log4cxx@0.12.1:', type=('build', 'link', 'run'))
     depends_on('pkgconfig', type=('build', 'link', 'run'))
     depends_on('psmisc', type=('run', 'test'))