From be3f08d0dee19e41f595b7145b9021700d3f9972 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Thu, 22 Mar 2018 13:42:41 -0700 Subject: [PATCH] llvm+python+lldb depends on py-six for versions 5 and up (#7056) --- var/spack/repos/builtin/packages/llvm/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 850554c406..26cdb088ed 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -89,6 +89,7 @@ class Llvm(CMakePackage): depends_on('ncurses', when='+lldb') depends_on('swig', when='+lldb') depends_on('libedit', when='+lldb') + depends_on('py-six', when='@5.0.0: +lldb +python') # gold support depends_on('binutils+gold', when='+gold') @@ -441,6 +442,8 @@ def cmake_args(self): '-DLLVM_POLLY_BUILD:Bool=OFF', '-DLLVM_POLLY_LINK_INTO_TOOLS:Bool=OFF']) + if '+python' in spec and '+lldb' in spec and spec.satisfies('@5.0.0:'): + cmake_args.append('-DLLDB_USE_SYSTEM_SIX:Bool=TRUE') if '+clang' not in spec: cmake_args.append('-DLLVM_EXTERNAL_CLANG_BUILD:Bool=OFF') if '+lldb' not in spec: