[PATCH] gnu: julia: Fix llvm-julia version

DoneSubmitted by Jean-Baptiste Volatier.
Details
2 participants
  • Efraim Flashner
  • Jean-Baptiste Volatier
Owner
unassigned
Severity
normal
J
J
Jean-Baptiste Volatier wrote on 16 Oct 21:12 +0200
(address . guix-patches@gnu.org)(name . Jean-Baptiste Volatier)(address . jbv@pm.me)
20211016191210.3069-1-jbv@pm.me
LLVM bundled in the binary julia distributed by upstream has itsversion with a "jl" suffix. The llvm-julia package does not havethis suffix, which causes some packages (e. g. LLVM.jl) to fail toload.
LLVM.jl does this in order to be sure that it is loading a LLVM aspatched for julia and not LLVM from the distribution which willlack the correct patches on distribs other than GUIX.
I guess there might be other packages that rely on this, so weshould fix our llvm-julia package.
* gnu/packages/julia.scm (llvm)[source]: Add missing upstream patch[arguments]: Add configure-flag to set a "jl" suffix to llvm version(julia)[arguments]: Symlink llvm to llvm-11jl.so--- gnu/packages/julia.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Toggle diff (34 lines)diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scmindex fe31e545c9..411f2e2e10 100644--- a/gnu/packages/julia.scm+++ b/gnu/packages/julia.scm@@ -131,6 +131,8 @@ (define llvm-julia "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") '("llvm-7.0-D44650" "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir")+ '("llvm7-symver-jlprefix"+ "00ng32x6xhm9czczirn5r1q1mc1myad44fqhi061hwh1vb46dwgm") '("llvm-6.0-DISABLE_ABI_CHECKS" "014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg") '("llvm9-D50010-VNCoercion-ni"@@ -211,7 +213,8 @@ (define llvm-julia ;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" ;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON"- "-DLLVM_LINK_LLVM_DYLIB=ON"))))+ "-DLLVM_LINK_LLVM_DYLIB=ON"+ "-DLLVM_VERSION_SUFFIX:STRING=jl")))) (inputs (append (package-inputs llvm-11)@@ -548,7 +551,7 @@ (define-public julia (basename file))))) (find-files (string-append (assoc-ref inputs pkgname) "/lib") pred)))))- (link "llvm" "libLLVM-11\\.so")+ (link "llvm" "libLLVM-11jl\\.so") (link "utf8proc" "libutf8proc\\.so") #t))) (add-after 'install 'make-wrapper
base-commit: 34b0aa16e77bdbb5b847267eb0f825a590e3d101
--2.33.1
E
E
Efraim Flashner wrote on 16 Nov 08:15 +0100
(name . Jean-Baptiste Volatier)(address . jbv@pm.me)(address . 51243-done@debbugs.gnu.org)
YZNaoeEZoJ0L0PnW@3900XT
Thanks. Patch pushed!
-- Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפאGPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351Confidentiality cannot be guaranteed on emails sent or received unencrypted
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmGTWp4ACgkQQarn3Mo9g1EQbg//VzgSwdTUA9nQXz4SThLxw6513hk26Nm7irkk/ANq12eRJ8+cnIO5gOBHKaRGn6p05t4FLa+VVKkrvQSDv9rHUztPUF8sFqDnbF6nyDT9Ka/n9dRMTrfXPBLIdLJm6WNRVGURDoHMoodTw+VGMb+qhAhfFxaslAC95ZK3Mh6r9Mgl5C1Luv1U2KbU+HHS9vszVvtFrYoWHQF99Z+BiK/5UM88SevQPIhtOLigf+3yWVxCF7nruRpZBG3fs/pplbCgYFbYB4JCvJN+baFapM30sTMq3GlbnIQhglObCx38CTD3uypiopG2nx01ZbEPVFko/iq15uFDHR7AFl0v6tEC2W4qgLr5K55CyvaMLt4YvTVpG/Vh971FkQZcsxUPnyQIK5lFtugUWxQfwON07HR9R/LSDv0S/Blibffl0s/rgOt0891g1q4Gqnrqp8Jdv8us5y2Zo/MZsF0F0KxtVwuNUUeARpZfPy9MZ8YzTiOp6G/DnRW/ZzgI0Bsp/2cLzEx1+7cXIob7jztchcoBXtlnAu1ypeczE0j1TM3PmQ/Cs1Dm/FbcDiVTGX1vhxDRrAiNZpf5bkhBujcEIkNaCa979fYIgfaPXmh0AutyALdJoMG/sStvyB1jvGD77CKju4OsQgKxrKHb+wJ91NiDYYDGM4AaQDdYl8690EepEqHHsmM==7Yz3-----END PGP SIGNATURE-----

Closed
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send email to 51243@debbugs.gnu.org