ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: julia: Fix llvm-julia version.

Browse source 
LLVM bundled in the binary julia distributed by upstream has its
version with a "jl" suffix. The llvm-julia package does not have
this suffix, which causes some packages (e. g. LLVM.jl) to fail to
load.

LLVM.jl does this in order to be sure that it is loading a LLVM as
patched for julia and not LLVM from the distribution which will
lack the correct patches on distribs other than GUIX.

I guess there might be other packages that rely on this, so we
should 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

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Jean-Baptiste Volatier 2021-10-16 19:12:14 +00:00 committed by Efraim Flashner
parent 2b56e477f3
commit a1a7e2b951
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/julia.scm
View file

@ -131,6 +131,8 @@ (define llvm-julia
"19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602")
'("llvm-7.0-D44650" '("llvm-7.0-D44650"
"1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir") "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir")
'("llvm7-symver-jlprefix"
"00ng32x6xhm9czczirn5r1q1mc1myad44fqhi061hwh1vb46dwgm")
'("llvm-6.0-DISABLE_ABI_CHECKS" '("llvm-6.0-DISABLE_ABI_CHECKS"
"014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg") "014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg")
'("llvm9-D50010-VNCoercion-ni" '("llvm9-D50010-VNCoercion-ni"
@ -211,7 +213,8 @@ (define llvm-julia
;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" ;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" ;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
"-DLLVM_ENABLE_DUMP=ON" "-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_LINK_LLVM_DYLIB=ON")))) "-DLLVM_LINK_LLVM_DYLIB=ON"
"-DLLVM_VERSION_SUFFIX:STRING=jl"))))
(inputs (inputs
(append (append
(package-inputs llvm-11) (package-inputs llvm-11)
@ -548,7 +551,7 @@ (define-public julia
(basename file))))) (basename file)))))
(find-files (string-append (assoc-ref inputs pkgname) (find-files (string-append (assoc-ref inputs pkgname)
"/lib") pred))))) "/lib") pred)))))
(link "llvm" "libLLVM-11\\.so") (link "llvm" "libLLVM-11jl\\.so")
(link "utf8proc" "libutf8proc\\.so") (link "utf8proc" "libutf8proc\\.so")
#t))) #t)))
(add-after 'install 'make-wrapper (add-after 'install 'make-wrapper