summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2024-01-26 10:30:27 +0100
committerGitHub <noreply@github.com>2024-01-26 10:30:27 +0100
commit6a4573ce5aef2c6b890b11092620a36d4395cef9 (patch)
tree5f0dc5640f91410f0ab1aec6415061596a8e5d60 /var
parente77128dfa2b3ced3fe4df241f70117e4022b1d65 (diff)
downloadspack-6a4573ce5aef2c6b890b11092620a36d4395cef9.tar.gz
spack-6a4573ce5aef2c6b890b11092620a36d4395cef9.tar.bz2
spack-6a4573ce5aef2c6b890b11092620a36d4395cef9.tar.xz
spack-6a4573ce5aef2c6b890b11092620a36d4395cef9.zip
julia: patch for system lld and dsymutil (#42282)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/julia/package.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py
index 857d51bdbe..1b9199e3cf 100644
--- a/var/spack/repos/builtin/packages/julia/package.py
+++ b/var/spack/repos/builtin/packages/julia/package.py
@@ -169,6 +169,7 @@ class Julia(MakefilePackage):
depends_on("patchelf@0.13:0.17", type="build")
depends_on("perl", type="build")
depends_on("libwhich", type="build")
+ depends_on("which", type="build") # for detecting 7z, lld, dsymutil
depends_on("python", type="build")
depends_on("blas") # note: for now openblas is fixed...
@@ -197,6 +198,13 @@ class Julia(MakefilePackage):
patch("use-add-rpath.patch", when="@:1.8.0")
patch("use-add-rpath-2.patch", when="@1.8.1:1.8")
+ # Fix the path to Spack llvm's lld and dsymutil
+ patch(
+ "https://github.com/JuliaLang/julia/commit/55c13d234c1523861b278f7989b1af105ef0e88f.patch?full_index=1",
+ sha256="00569f40e1845329060a714813e509677949e633a0e833c40a3c70dcf9269cc1",
+ when="@1.9:1.10",
+ )
+
# Fix libstdc++ not being found (https://github.com/JuliaLang/julia/issues/47987)
patch(
"https://github.com/JuliaLang/julia/pull/48342.patch?full_index=1",