gnu: LLVM: Switch to 13 as the default.

* gnu/packages/llvm.scm (llvm, clang-runtime, clang, clang-toolchain): Use
version 13.
* gnu/packages/gnuzilla.scm (mozjs-78)[native-inputs]: Change from LLVM to LLVM-9.
* gnu/packages/rust.scm (rust-1.39, rust-1.40)[inputs]: Likewise.
* gnu/packages/debug.scm (c-reduce)[inputs]: Stick with CLANG-9 and/or LLVM-9.
* gnu/packages/diffoscope.scm (diffoscope)[inputs]: Likewise.
* gnu/packages/linux.scm (bcc, bpftrace)[inputs]: Likewise.
* gnu/packages/llvm.scm (libclc, libomp)[native-inputs]: Likewise.
* gnu/packages/games.scm (hedgewars)[native-inputs]: Likewise.
* gnu/packages/graphics.scm (openshadinglanguage)[native-inputs]: Likewise.
* gnu/packages/opencl.scm (pocl)[inputs]: Likewise.
This commit is contained in:
Marius Bakke 2022-01-30 18:29:57 +01:00
parent 16a45eae2d
commit 4ed2b6ac38
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
9 changed files with 19 additions and 19 deletions

View file

@ -132,8 +132,8 @@ (define-public c-reduce
(native-inputs (list flex))
(inputs
`(("astyle" ,astyle)
("llvm" ,llvm)
("clang" ,clang)
("llvm" ,llvm-9)
("clang" ,clang-9)
("indent" ,indent)
("perl" ,perl)
("exporter-lite" ,perl-exporter-lite)

View file

@ -186,7 +186,7 @@ (define-public diffoscope
hdf5
imagemagick
libarchive
llvm
llvm-9
lz4
mono
ocaml

View file

@ -9367,7 +9367,7 @@ (define-public hedgewars
("sdl" ,(sdl-union
(list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image)))))
(native-inputs
(list clang ghc pkg-config qttools))
(list clang-9 ghc pkg-config qttools))
(home-page "https://hedgewars.org/")
(synopsis "Turn-based artillery game featuring fighting hedgehogs")
(description

View file

@ -567,7 +567,8 @@ (define-public mozjs-78
(native-inputs
`(("autoconf" ,autoconf-2.13)
("automake" ,automake)
("llvm" ,llvm) ;for llvm-objdump
;; TODO(staging): Use the default LLVM in the next rebuild cycle.
("llvm" ,llvm-9) ;for llvm-objdump
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-3)

View file

@ -618,9 +618,9 @@ (define-public openshadinglanguage
"|"))))))))
(native-inputs
(list bison
clang
clang-9
flex
llvm
llvm-9
pybind11
python-wrapper))
(inputs

View file

@ -8515,7 +8515,7 @@ (define-public bcc
(native-inputs
(list bison flex))
(inputs
`(("clang-toolchain" ,clang-toolchain)
`(("clang-toolchain" ,clang-toolchain-9)
("libbpf" ,(package-source libbpf))
;; LibElf required but libelf does not contain
;; archives, only object files.
@ -8595,7 +8595,7 @@ (define-public bpftrace
(native-inputs
(list bison flex))
(inputs
(list bcc clang-toolchain elfutils libbpf))
(list bcc clang-toolchain-9 elfutils libbpf))
(arguments
`(#:tests? #f ;Tests require googletest sources.
#:configure-flags

View file

@ -1038,10 +1038,10 @@ (define-public clang-3.5
#:patches '("clang-3.5-libc-search-path.patch")))
;; Default LLVM and Clang version.
(define-public llvm llvm-9)
(define-public clang-runtime clang-runtime-9)
(define-public clang clang-9)
(define-public clang-toolchain clang-toolchain-9)
(define-public llvm llvm-13)
(define-public clang-runtime clang-runtime-13)
(define-public clang clang-13)
(define-public clang-toolchain clang-toolchain-13)
(define-public llvm-for-rocm
(package
@ -1389,7 +1389,7 @@ (define-public libclc
(add-after 'unpack 'chdir
(lambda _ (chdir "libclc") #t)))))
(native-inputs
(list clang llvm python))
(list clang-9 llvm-9 python))
(home-page "https://libclc.llvm.org")
(synopsis "Libraries for the OpenCL programming language")
(description
@ -1418,7 +1418,7 @@ (define-public libomp
"-DOPENMP_TEST_CXX_COMPILER=clang++")
#:test-target "check-libomp"))
(native-inputs
(list clang llvm perl pkg-config))
(list clang-9 llvm-9 perl pkg-config))
(inputs
(list `(,hwloc "lib")))
(home-page "https://openmp.llvm.org")

View file

@ -290,8 +290,7 @@ (define-public pocl
(native-inputs
(list libltdl pkg-config))
(inputs
(list clang
`(,hwloc-2 "lib") llvm opencl-icd-loader))
(list clang-9 llvm-9 `(,hwloc-2 "lib") opencl-icd-loader))
(arguments
`(#:configure-flags
(list "-DENABLE_ICD=ON"

View file

@ -165,7 +165,7 @@ (define rust-1.39
(inputs
`(("libcurl" ,curl)
("libssh2" ,libssh2)
("llvm" ,llvm)
("llvm" ,llvm-9)
("openssl" ,openssl)
("zlib" ,zlib)))
(native-inputs
@ -493,7 +493,7 @@ (define rust-1.40
("which" ,which)))
(inputs
`(("jemalloc" ,jemalloc)
("llvm" ,llvm)
("llvm" ,llvm-9)
("openssl" ,openssl)
("libssh2" ,libssh2) ; For "cargo"
("libcurl" ,curl))) ; For "cargo"