From 6a4573ce5aef2c6b890b11092620a36d4395cef9 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Fri, 26 Jan 2024 10:30:27 +0100 Subject: julia: patch for system lld and dsymutil (#42282) --- var/spack/repos/builtin/packages/julia/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'var') 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", -- cgit v1.2.3-70-g09d2