diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/binder/llvm_dir.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/binder/package.py | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/binder/llvm_dir.patch b/var/spack/repos/builtin/packages/binder/llvm_dir.patch new file mode 100644 index 0000000000..dbd38b2e80 --- /dev/null +++ b/var/spack/repos/builtin/packages/binder/llvm_dir.patch @@ -0,0 +1,12 @@ +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 06a0353..32678eb 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -107,7 +107,6 @@ if(USE_EXTERNAL_LLVM) + else() + target_link_libraries(binder + PRIVATE +- ${lib_llvm_path} + clang + clang-cpp + ) diff --git a/var/spack/repos/builtin/packages/binder/package.py b/var/spack/repos/builtin/packages/binder/package.py index 0b08dd0c29..a3271a52e9 100644 --- a/var/spack/repos/builtin/packages/binder/package.py +++ b/var/spack/repos/builtin/packages/binder/package.py @@ -24,13 +24,17 @@ class Binder(CMakePackage): license("MIT") version("master", branch="master") + version("1.4.2", tag="v1.4.2", commit="b9f309e0513e745a7465571321e87595fa33d195") version("1.3.0", tag="v1.3.0", commit="e9b55985af297ca161d615058e4a5da07c22bc77") version("1.2.0", tag="v1.2.0", commit="90cf5b31b6f4ecad3fe87518ca2b949dc9e8ed1a") version("1.1.0", tag="v1.0.0", commit="3de7949343197295250f988716d511a264b21324") version("1.0.0", tag="v1.0.0", commit="3de7949343197295250f988716d511a264b21324") # Add dependencies - depends_on("llvm+clang+llvm_dylib@7.0:9") + depends_on("llvm+clang+llvm_dylib@7.0:9", when="@:1.3.0") + depends_on("llvm+clang+llvm_dylib@7.0:", when="@1.4.2:") + + patch("llvm_dir.patch", when="@1.4.2:") def cmake_args(self): spec = self.spec |