Merge remote-tracking branch 'origin/master' into core-updates

Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
This commit is contained in:
Efraim Flashner 2023-01-30 11:33:18 +02:00
commit 4cf1acc7f3
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
740 changed files with 619028 additions and 314277 deletions

View file

@ -7,7 +7,7 @@
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 20182022 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2021-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
@ -25,6 +25,7 @@
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -61,7 +62,6 @@
#:use-module (gnu packages bootstrap) ;glibc-dynamic-linker
#:use-module (gnu packages check) ;python-lit
#:use-module (gnu packages compression)
#:use-module (gnu packages julia) ;julia-patch
#:use-module (gnu packages libedit)
#:use-module (gnu packages libffi)
#:use-module (gnu packages lua)
@ -175,11 +175,14 @@ compiler. In LLVM this library is called \"compiler-rt\".")
(properties
(append `((release-monitoring-url
. ,%llvm-release-monitoring-url))
(clang-properties (package-version llvm)))))
(clang-properties (package-version llvm))))
(legacy-build-shared-libs? #f))
"Produce Clang with dependencies on LLVM and CLANG-RUNTIME, and applying the
given PATCHES. When TOOLS-EXTRA is given, it must point to the
'clang-tools-extra' tarball, which contains code for 'clang-tidy', 'pp-trace',
'modularize', and other tools."
'modularize', and other tools. LEGACY-BUILD-SHARED-LIBS? is used to configure
the package to use the legacy BUILD_SHARED_LIBS CMake option, which was used
until LLVM/Clang 14."
(package
(name "clang")
(version (package-version llvm))
@ -220,14 +223,17 @@ given PATCHES. When TOOLS-EXTRA is given, it must point to the
(string-append "-DC_INCLUDE_DIRS="
(assoc-ref %build-inputs "libc")
"/include")
,@(if (target-riscv64?)
(list "-DLIBOMP_LIBFLAGS=-latomic"
"-DCMAKE_SHARED_LINKER_FLAGS=-latomic")
`()))
,@(if (target-riscv64?)
(list "-DLIBOMP_LIBFLAGS=-latomic"
"-DCMAKE_SHARED_LINKER_FLAGS=-latomic")
`())
,@(if legacy-build-shared-libs?
'()
(list "-DCLANG_LINK_CLANG_DYLIB=ON")))
,@(if (target-riscv64?)
`(#:make-flags '("LDFLAGS=-latomic"))
'())
`(#:make-flags '("LDFLAGS=-latomic"))
'())
;; Don't use '-g' during the build to save space.
#:build-type "Release"
@ -246,9 +252,11 @@ given PATCHES. When TOOLS-EXTRA is given, it must point to the
(string-delete #\- (package-version llvm))
".src")
"tools/extra")
;; Build and link to shared libraries.
(substitute* "cmake/modules/AddClang.cmake"
(("BUILD_SHARED_LIBS") "True"))
,@(if legacy-build-shared-libs?
;; Build and link to shared libraries.
'((substitute* "cmake/modules/AddClang.cmake"
(("BUILD_SHARED_LIBS") "True")))
'())
#t))))
'())
(add-after 'unpack 'add-missing-triplets
@ -322,6 +330,15 @@ given PATCHES. When TOOLS-EXTRA is given, it must point to the
(("@GLIBC_LIBDIR@")
(string-append libc "/lib"))))))
#t)))
;; Awkwardly, multiple phases added after the same phase,
;; e.g. unpack, get applied in the reverse order. In other
;; words, adding 'change-directory last means it occurs
;; first after the unpack phase.
,@(if (version>=? version "14")
'((add-after 'unpack 'change-directory
(lambda _
(chdir "clang"))))
'())
,@(if (version>=? version "10")
`((add-after 'install 'adjust-cmake-file
(lambda* (#:key outputs #:allow-other-keys)
@ -544,10 +561,12 @@ output), and Binutils.")
("libc-static" ,glibc "static")))))
(define %llvm-monorepo-hashes
'(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx")))
'(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx")
("15.0.6" . "13vj0q6if5095a3awq8d97l17qdsc7fks6avkai9k80kl0kzxpv6")))
(define %llvm-patches
'(("14.0.6" . ("clang-14.0-libc-search-path.patch"))))
'(("14.0.6" . ("clang-14.0-libc-search-path.patch"))
("15.0.6" . ("clang-15.0-libc-search-path.patch"))))
(define (llvm-monorepo version)
(origin
@ -559,20 +578,74 @@ output), and Binutils.")
(sha256 (base32 (assoc-ref %llvm-monorepo-hashes version)))
(patches (map search-patch (assoc-ref %llvm-patches version)))))
(define-public llvm-14
;;; TODO: Make the base llvm all other LLVM inherit from on core-updates.
(define-public llvm-15
(package
(name "llvm")
(version "14.0.6")
(version "15.0.6")
(source (llvm-monorepo version))
(build-system cmake-build-system)
(outputs '("out" "opt-viewer"))
(native-inputs
`(("python" ,python-wrapper)
("perl" ,perl)))
(inputs
(list libffi))
(propagated-inputs
(list zlib)) ;to use output from llvm-config
(arguments
(list
#:configure-flags
#~(list
;; These options are required for cross-compiling LLVM according
;; to <https://llvm.org/docs/HowToCrossCompileLLVM.html>.
#$@(if (%current-target-system)
#~((string-append "-DLLVM_TABLEGEN="
#+(file-append this-package
"/bin/llvm-tblgen"))
#$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE="
(%current-target-system))
#$(string-append "-DLLVM_TARGET_ARCH="
(system->llvm-target))
#$(string-append "-DLLVM_TARGETS_TO_BUILD="
(system->llvm-target)))
'())
;; Note: sadly, the build system refuses the use of
;; -DBUILD_SHARED_LIBS=ON and the large static archives are needed to
;; build clang-runtime, so we cannot delete them.
"-DLLVM_BUILD_LLVM_DYLIB=ON"
"-DLLVM_LINK_LLVM_DYLIB=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON" ;for some third-party utilities
"-DLLVM_INSTALL_UTILS=ON" ;needed for rustc
"-DLLVM_PARALLEL_LINK_JOBS=1") ;cater to smaller build machines
;; Don't use '-g' during the build, to save space.
#:build-type "Release"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'change-directory
(lambda _
(chdir "llvm")))
(add-after 'install 'install-opt-viewer
(lambda* (#:key outputs #:allow-other-keys)
(let* ((opt-viewer-share (string-append #$output:opt-viewer
"/share")))
(mkdir-p opt-viewer-share)
(rename-file (string-append #$output "/share/opt-viewer")
opt-viewer-share)))))))
(native-inputs (list python-wrapper perl))
(inputs (list libffi))
(propagated-inputs (list zlib)) ;to use output from llvm-config
(home-page "https://www.llvm.org")
(synopsis "Optimizing compiler infrastructure")
(description
"LLVM is a compiler infrastructure designed for compile-time, link-time,
runtime, and idle-time optimization of programs from arbitrary programming
languages. It currently supports compilation of C and C++ programs, using
front-ends derived from GCC 4.0.1. A new front-end for the C family of
languages is in development. The compiler infrastructure includes mirror sets
of programming tools as well as libraries with equivalent functionality.")
(license license:asl2.0)
(properties `((release-monitoring-url . ,%llvm-release-monitoring-url)))))
(define-public llvm-14
(package
(inherit llvm-15)
(version "14.0.6")
(source (llvm-monorepo version))
(arguments
(list
#:configure-flags
@ -612,17 +685,33 @@ output), and Binutils.")
(mkdir-p opt-viewer-share-dir)
(rename-file (string-append out "/share/opt-viewer")
opt-viewer-dir)))))))
(home-page "https://www.llvm.org")
(synopsis "Optimizing compiler infrastructure")
(description
"LLVM is a compiler infrastructure designed for compile-time, link-time,
runtime, and idle-time optimization of programs from arbitrary programming
languages. It currently supports compilation of C and C++ programs, using
front-ends derived from GCC 4.0.1. A new front-end for the C family of
languages is in development. The compiler infrastructure includes mirror sets
of programming tools as well as libraries with equivalent functionality.")
(license license:asl2.0)
(properties `((release-monitoring-url . ,%llvm-release-monitoring-url)))))
(native-inputs
`(("python" ,python-wrapper)
("perl" ,perl)))))
(define-public clang-runtime-15
(let ((template (clang-runtime-from-llvm llvm-15)))
(package
(inherit template)
(arguments
(substitute-keyword-arguments (package-arguments template)
((#:phases phases '(@ (guix build cmake-build-system) %standard-phases))
#~(modify-phases #$phases
(add-after 'unpack 'change-directory
(lambda _
(chdir "compiler-rt")))
(add-after 'install 'delete-static-libraries
;; Reduce size from 33 MiB to 7.4 MiB.
(lambda _
(for-each delete-file
(find-files #$output "\\.a(\\.syms)?$"))))))))
(native-inputs
(modify-inputs (package-native-inputs template)
(prepend gcc-12))) ;libfuzzer fails to build with GCC 11
(inputs
(modify-inputs (package-inputs template)
(append libffi))))))
(define-public clang-runtime-14
(let ((template (clang-runtime-from-llvm llvm-14)))
@ -636,30 +725,72 @@ of programming tools as well as libraries with equivalent functionality.")
(lambda _
(chdir "compiler-rt"))))))))))
(define-public clang-15
(clang-from-llvm
llvm-15 clang-runtime-15
#:tools-extra
(origin
(method url-fetch)
(uri (llvm-uri "clang-tools-extra"
(package-version llvm-15)))
(sha256
(base32
"099v2yqg11h0h8qqddzkny6b77pafcr7vy5ksc33kqggji173ccj")))))
(define-public clang-14
(let ((template
(clang-from-llvm llvm-14 clang-runtime-14
#:tools-extra
(origin
(method url-fetch)
(uri (llvm-uri "clang-tools-extra"
(package-version llvm-14)))
(sha256
(base32
"0rhq4wkmvr369nkk059skzzw7jx6qhzqhmiwmqg4sp66avzviwvw"))))))
(package
(inherit template)
(arguments
(substitute-keyword-arguments (package-arguments template)
((#:phases phases '(@ (guix build cmake-build-system) %standard-phases))
#~(modify-phases #$phases
(add-after 'unpack 'change-directory
(lambda _
(chdir "clang"))))))))))
(clang-from-llvm
llvm-14 clang-runtime-14
#:legacy-build-shared-libs? #t
#:tools-extra
(origin
(method url-fetch)
(uri (llvm-uri "clang-tools-extra"
(package-version llvm-14)))
(sha256
(base32
"0rhq4wkmvr369nkk059skzzw7jx6qhzqhmiwmqg4sp66avzviwvw")))))
(define-public libomp-15
(package
(name "libomp")
(version (package-version llvm-15))
(source (llvm-monorepo version))
(build-system cmake-build-system)
;; XXX: Note this gets built with GCC because building with Clang itself
;; fails (missing <atomic>, even when libcxx is added as an input.)
(arguments
(list
#:configure-flags
#~(list "-DLIBOMP_USE_HWLOC=ON"
"-DOPENMP_TEST_C_COMPILER=clang"
"-DOPENMP_TEST_CXX_COMPILER=clang++")
#:test-target "check-libomp"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir-to-source-and-install-license
(lambda _
(chdir "openmp")
(install-file "LICENSE.TXT"
(string-append #$output "/share/doc")))))))
(native-inputs (list clang-15 llvm-15 perl pkg-config python))
(inputs (list `(,hwloc "lib")))
(home-page "https://openmp.llvm.org")
(synopsis "OpenMP run-time support library")
(description "This package provides the run-time support library developed
by the LLVM project for the OpenMP multi-theaded programming extension. This
package notably provides @file{libgomp.so}, which is has a binary interface
compatible with that of libgomp, the GNU Offloading and Multi Processing
Library.")
(properties `((release-monitoring-url . ,%llvm-release-monitoring-url)
(upstream-name . "openmp")))
(license license:expat)))
(define-public clang-toolchain-15
(make-clang-toolchain clang-15 libomp-15))
(define-public libomp-14
(package
(name "libomp")
(inherit libomp-15)
(version (package-version llvm-14))
(source (origin
(method url-fetch)
@ -668,36 +799,19 @@ of programming tools as well as libraries with equivalent functionality.")
(base32
"07zby3gwy5c8jssabrhjk3nsxlwipnm6sk4dsvck1l5d0br1ywsg"))
(file-name (string-append "libomp-" version ".tar.xz"))))
(build-system cmake-build-system)
;; XXX: Note this gets built with GCC because building with Clang itself
;; fails (missing <atomic>, even when libcxx is added as an input.)
(arguments
(list
#:configure-flags #~(list "-DLIBOMP_USE_HWLOC=ON"
"-DOPENMP_TEST_C_COMPILER=clang"
"-DOPENMP_TEST_CXX_COMPILER=clang++")
#:test-target "check-libomp"
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir-to-source-and-install-license
(lambda _
(chdir #$(string-append "../openmp-" version ".src"))
(install-file "LICENSE.TXT"
(string-append #$output "/share/doc")))))))
(substitute-keyword-arguments (package-arguments libomp-15)
((#:phases phases)
#~(modify-phases #$phases
(replace 'chdir-to-source-and-install-license
(lambda _
(chdir #$(string-append "../openmp-" version ".src"))
(install-file "LICENSE.TXT"
(string-append #$output "/share/doc"))))))))
(native-inputs
(list clang-14 llvm-14 perl pkg-config python))
(inputs
(list `(,hwloc "lib")))
(home-page "https://openmp.llvm.org")
(synopsis "OpenMP run-time support library")
(description
"This package provides the run-time support library developed by the LLVM
project for the OpenMP multi-theaded programming extension. This package
notably provides @file{libgomp.so}, which is has a binary interface compatible
with that of libgomp, the GNU Offloading and Multi Processing Library.")
(properties `((release-monitoring-url . ,%llvm-release-monitoring-url)
(upstream-name . "openmp")))
(license license:expat)))
(modify-inputs (package-native-inputs libomp-15)
(replace "clang" clang-14)
(replace "llvm" llvm-14)))))
(define-public clang-toolchain-14
(make-clang-toolchain clang-14 libomp-14))
@ -728,6 +842,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-13
(clang-from-llvm llvm-13 clang-runtime-13
"1j8pr5kk8iqyb4jds3yl7c6x672617h4ngkpl4575j7mk4nrwykq"
#:legacy-build-shared-libs? #t
#:patches '("clang-13.0-libc-search-path.patch")
#:tools-extra
(origin
@ -842,6 +957,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-12
(clang-from-llvm llvm-12 clang-runtime-12
"0px4gl27az6cdz6adds89qzdwb1cqpjsfvrldbz9qvpmphrj34bf"
#:legacy-build-shared-libs? #t
#:patches '("clang-12.0-libc-search-path.patch")
#:tools-extra
(origin
@ -897,6 +1013,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-11
(clang-from-llvm llvm-11 clang-runtime-11
"12sm91qx2m79cvj75a9aazf2x8xybjbd593dv6v7rxficpq8i0ha"
#:legacy-build-shared-libs? #t
#:patches '("clang-11.0-libc-search-path.patch")
#:tools-extra
(origin
@ -954,12 +1071,13 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-10
(clang-from-llvm llvm-10 clang-runtime-10
"091bvcny2lh32zy8f3m9viayyhb2zannrndni7325rl85cwgr6pr"
#:legacy-build-shared-libs? #t
#:patches '("clang-10.0-libc-search-path.patch")
#:tools-extra
(origin
(method url-fetch)
(uri (llvm-uri "clang-tools-extra"
(package-version llvm-10)))
(package-version llvm-10)))
(sha256
(base32
"06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh")))))
@ -1024,6 +1142,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-9
(clang-from-llvm llvm-9 clang-runtime-9
"0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p"
#:legacy-build-shared-libs? #t
#:patches '("clang-9.0-libc-search-path.patch")))
(define-public libomp-9
@ -1068,6 +1187,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-8
(clang-from-llvm llvm-8 clang-runtime-8
"0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh"
#:legacy-build-shared-libs? #t
#:patches '("clang-8.0-libc-search-path.patch")))
(define-public libomp-8
@ -1110,6 +1230,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-7
(clang-from-llvm llvm-7 clang-runtime-7
"0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"
#:legacy-build-shared-libs? #t
#:patches '("clang-7.0-libc-search-path.patch")))
(define-public libomp-7
@ -1151,6 +1272,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-6
(clang-from-llvm llvm-6 clang-runtime-6
"0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w"
#:legacy-build-shared-libs? #t
#:patches '("clang-6.0-libc-search-path.patch")))
(define-public libomp-6
@ -1212,6 +1334,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-3.9.1
(clang-from-llvm llvm-3.9.1 clang-runtime-3.9.1
"0qsyyb40iwifhhlx9a3drf8z6ni6zwyk3bvh0kx2gs6yjsxwxi76"
#:legacy-build-shared-libs? #t
#:patches '("clang-3.8-libc-search-path.patch")))
(define-public llvm-3.8
@ -1238,6 +1361,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-3.8
(clang-from-llvm llvm-3.8 clang-runtime-3.8
"1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"
#:legacy-build-shared-libs? #t
#:patches '("clang-3.8-libc-search-path.patch")))
(define-public llvm-3.7
@ -1264,6 +1388,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-3.7
(clang-from-llvm llvm-3.7 clang-runtime-3.7
"0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"
#:legacy-build-shared-libs? #t
#:patches '("clang-3.5-libc-search-path.patch")))
(define-public llvm-3.6
@ -1323,6 +1448,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(define-public clang-3.5
(clang-from-llvm llvm-3.5 clang-runtime-3.5
"0846h8vn3zlc00jkmvrmy88gc6ql6014c02l4jv78fpvfigmgssg"
#:legacy-build-shared-libs? #t
#:patches '("clang-3.5-libc-search-path.patch")))
;; Default LLVM and Clang version.
@ -1392,14 +1518,14 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
(properties `((release-monitoring-url . ,%llvm-release-monitoring-url)))
(license license:asl2.0))) ;with LLVM exceptions
(define-public lld-14
(define-public lld-15
(package
(name "lld")
(version "14.0.6")
(version (package-version llvm-15))
(source (llvm-monorepo version))
(build-system cmake-build-system)
(inputs
(list llvm-14))
(list llvm-15))
(arguments
'(#:build-type "Release"
;; TODO: Tests require the lit tool, which isn't installed by the LLVM
@ -1415,6 +1541,14 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.")
components which highly leverage existing libraries in the larger LLVM Project.")
(license license:asl2.0))) ; With LLVM exception
(define-public lld-14
(package
(inherit lld-15)
(version "14.0.6")
(source (llvm-monorepo version))
(inputs
(list llvm-14))))
(define-public lld-13
(package
(inherit lld-14)
@ -1451,20 +1585,35 @@ components which highly leverage existing libraries in the larger LLVM Project."
(inputs (modify-inputs (package-inputs lld)
(replace "llvm" llvm-12)))))
(define-public lld-11
(package
(inherit lld-12)
(version "11.0.0")
(source (origin
(method url-fetch)
(uri (llvm-uri "lld" version))
(sha256
(base32
"077xyh7sij6mhp4dc4kdcmp9whrpz332fa12rwxnzp3wgd5bxrzg"))))
(inputs (modify-inputs (package-inputs lld)
(replace "llvm" llvm-11)))))
(define-public lld lld-14)
(define* (make-lld-wrapper lld #:key lld-as-ld?)
"Return a LLD wrapper. When LLD-AS-LD? is true, create a 'ld' symlink that
points to 'lld'."
(package
(inherit lld)
(name (if lld-as-ld? "lld-as-ld-wrapper" "lld-wrapper"))
(version "0")
(source #f)
(build-system trivial-build-system)
(native-inputs '())
(inputs (list (make-ld-wrapper "ld.lld-wrapper" #:binutils lld
#:linker "ld.lld")
(make-ld-wrapper "lld-wrapper" #:binutils lld #:linker
"lld")))
(propagated-inputs '())
(build-system trivial-build-system)
(arguments
(list #:builder
#~(let ((ld.lld (string-append #$(this-package-input
@ -1481,22 +1630,23 @@ points to 'lld'."
(synopsis "LLD linker wrapper")
(description "This is a linker wrapper for LLD; like @code{ld-wrapper}, it
wraps the linker to add any missing @code{-rpath} flags, and to detect any
misuse of libraries outside of the store.")
(home-page "https://www.gnu.org/software/guix/")
(license license:gpl3+)))
misuse of libraries outside of the store.")))
;;; A LLD wrapper suitable to use with -fuse-ld and GCC or with Clang.
(define-public lld-wrapper
(make-lld-wrapper lld))
;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld.
(define-public lld-as-ld-wrapper-15
(make-lld-wrapper lld-15 #:lld-as-ld? #t))
(define-public lld-as-ld-wrapper
(make-lld-wrapper lld #:lld-as-ld? #t))
(define-public lldb
(package
(name "lldb")
(version "14.0.6")
(version (package-version llvm-15))
(source (llvm-monorepo version))
(build-system cmake-build-system)
(arguments
@ -1510,8 +1660,8 @@ misuse of libraries outside of the store.")
(native-inputs
(list pkg-config swig))
(inputs
(list clang-14
llvm-14
(list clang-15
llvm-15
;; Optional (but recommended) inputs.
ncurses
libedit
@ -1530,34 +1680,43 @@ which highly leverage existing libraries in the larger LLVM project.")
(define-public libcxx
(package
(name "libcxx")
(version "9.0.1")
(source
(origin
(method url-fetch)
(uri (llvm-uri "libcxx" version))
(sha256
(base32
"0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089"))))
(version (package-version llvm-15))
(source (llvm-monorepo version))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases (@ (guix build cmake-build-system) %standard-phases)
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
;; Hide GCC's C++ headers so that they do not interfere with
;; the ones we are attempting to build.
(setenv "CPLUS_INCLUDE_PATH"
(string-join (delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:))
":"))
(format #t
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))
#t))))))
(list
#:tests? #f
#:configure-flags
#~(list "-DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi"
"-DCMAKE_C_COMPILER=clang"
"-DCMAKE_CXX_COMPILER=clang++"
;; libc++.so is actually a GNU ld style linker script, however,
;; CMake still tries to fix the RUNPATH of it during the install
;; step. This argument tells CMake to use the install directory
;; as RUNPATH and don't attempt to patch it.
;; See also: https://gitlab.kitware.com/cmake/cmake/-/issues/22963
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'enter-subdirectory
(lambda _
(chdir "runtimes")))
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
;; Hide GCC's C++ headers so that they do not interfere with
;; the ones we are attempting to build.
(setenv "CPLUS_INCLUDE_PATH"
(string-join (delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:))
":"))
(format #t
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))
#t))))))
(native-inputs
(list clang llvm))
(list clang llvm python))
(home-page "https://libcxx.llvm.org")
(synopsis "C++ standard library")
(description
@ -1573,11 +1732,29 @@ use with Clang, targeting C++11, C++14 and above.")
(version (package-version llvm-6))
(source
(origin
(inherit (package-source libcxx))
(method url-fetch)
(uri (llvm-uri "libcxx" version))
(sha256
(base32
"0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n"))))
(arguments
(list
#:phases
#~(modify-phases %standard-phases
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
;; Hide GCC's C++ headers so that they do not interfere with
;; the ones we are attempting to build.
(setenv "CPLUS_INCLUDE_PATH"
(string-join (delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:))
":"))
(format #t
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))
#t))))))
(native-inputs
(list clang-6 llvm-6))))
@ -1597,38 +1774,43 @@ use with Clang, targeting C++11, C++14 and above.")
"0ki6796b5z08kh3a3rbysr5wwb2dkl6wal5dzd03i4li5xfkvx1g"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
(list (string-append "-DLIBCXXABI_LIBCXX_INCLUDES="
(assoc-ref %build-inputs "libcxx")
"/include")
"-DCMAKE_C_COMPILER=clang"
"-DCMAKE_CXX_COMPILER=clang++")
#:phases
(modify-phases (@ (guix build cmake-build-system) %standard-phases)
(add-after 'unpack 'chdir
(lambda _ (chdir "libcxxabi")))
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
;; Hide GCC's C++ headers so that they do not interfere with
;; the ones we are attempting to build.
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(cons (string-append
(assoc-ref inputs "libcxx") "/include/c++/v1")
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:)))
":"))
(format #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH")))))
(add-after 'install 'install-headers
(lambda* (#:key outputs #:allow-other-keys)
(let ((include-dir (string-append
(assoc-ref outputs "out") "/include")))
(install-file "../libcxxabi/include/__cxxabi_config.h" include-dir)
(install-file "../libcxxabi/include/cxxabi.h" include-dir)))))))
(list
#:configure-flags
#~(list (string-append "-DLIBCXXABI_LIBCXX_INCLUDES="
#$(this-package-native-input "libcxx")
"/include")
"-DCMAKE_C_COMPILER=clang"
"-DCMAKE_CXX_COMPILER=clang++")
#:phases
#~(modify-phases (@ (guix build cmake-build-system) %standard-phases)
(add-after 'unpack 'chdir
(lambda _ (chdir "libcxxabi")))
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
;; Hide GCC's C++ headers so that they do not interfere with
;; the ones we are attempting to build.
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(cons (string-append
(assoc-ref inputs "libcxx") "/include/c++/v1")
(delete (string-append gcc "/include/c++")
(string-split
(getenv "CPLUS_INCLUDE_PATH")
#\:)))
":"))
(format
#true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH")))))
(add-after 'install 'install-headers
(lambda* (#:key outputs #:allow-other-keys)
(let ((include-dir (string-append
(assoc-ref outputs "out") "/include")))
(install-file "../libcxxabi/include/__cxxabi_config.h"
include-dir)
(install-file "../libcxxabi/include/cxxabi.h"
include-dir)))))))
(native-inputs
(list clang-6 llvm-6 libcxx-6))
(home-page "https://libcxxabi.llvm.org")
@ -1644,27 +1826,29 @@ standard C++ library.")
(name "libcxx+libcxxabi")
(version (package-version libcxx-6))
(arguments
`(#:configure-flags
(list "-DLIBCXX_CXX_ABI=libcxxabi"
(string-append "-DLIBCXX_CXX_ABI_INCLUDE_PATHS="
(assoc-ref %build-inputs "libcxxabi")
"/include"))
#:phases
(modify-phases (@ (guix build cmake-build-system) %standard-phases)
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
;; Hide GCC's C++ headers so that they do not interfere with
;; the ones we are attempting to build.
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:))
":"))
(format #true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))))))))
(list
#:configure-flags
#~(list "-DLIBCXX_CXX_ABI=libcxxabi"
(string-append "-DLIBCXX_CXX_ABI_INCLUDE_PATHS="
#$(this-package-native-input "libcxxabi")
"/include"))
#:phases
#~(modify-phases (@ (guix build cmake-build-system) %standard-phases)
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys)
(let ((gcc (assoc-ref inputs "gcc")))
;; Hide GCC's C++ headers so that they do not interfere with
;; the ones we are attempting to build.
(setenv "CPLUS_INCLUDE_PATH"
(string-join
(delete (string-append gcc "/include/c++")
(string-split (getenv "CPLUS_INCLUDE_PATH")
#\:))
":"))
(format
#true
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))))))))
(native-inputs
(list clang-6 llvm-6 libcxxabi-6))))
@ -1928,126 +2112,20 @@ LLVM."))))
(define-public llvm-julia
(package
(inherit llvm-11)
(name "llvm-julia")
(properties `((hidden? . #t)
,@(package-properties llvm-11)))
(source (origin
(inherit (package-source llvm-11))
;; Those patches are inside the Julia source repo.
;; They are _not_ Julia specific (https://github.com/julialang/julia#llvm)
;; but they are required to build Julia.
;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919628
(patches
(map (match-lambda
((name hash)
(julia-patch name hash)))
(list
'("llvm-D27629-AArch64-large_model_6.0.1"
"1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z")
'("llvm8-D34078-vectorize-fdiv"
"19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602")
'("llvm-7.0-D44650"
"1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir")
'("llvm7-symver-jlprefix"
"00ng32x6xhm9czczirn5r1q1mc1myad44fqhi061hwh1vb46dwgm")
'("llvm-6.0-DISABLE_ABI_CHECKS"
"014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg")
'("llvm9-D50010-VNCoercion-ni"
"1s1d3sjsiq4vxg7ncy5cz56zgy5vcq6ls3iqaiqkvr23wyryqmdx")
'("llvm7-revert-D44485"
"0f59kq3p3mpwsbmskypbi4zn01l6ig0x7v2rjp08k2r8z8m6fa8n")
'("llvm-11-D75072-SCEV-add-type"
"176xi1lnbnv2rcs05ywhyb7pd0xgmibayvwzksksg44wg2dh8mbx")
'("llvm-julia-tsan-custom-as"
"0awh40kf6lm4wn1nsjd1bmhfwq7rqj811szanp2xkpspykw9hg9s")
'("llvm-D80101"
"1gsdwmgmpbignvqyxcnlprj899259p3dvdznlncd84ss445qgq3j")
'("llvm-D84031"
"0nks9sbk7p0r5gyr0idrmm93a5fmdai8kihz9532dx4zhcvvqbjc")
'("llvm-10-D85553"
"1zjq7j9q2qp56hwkc8yc8f0z7kvam3j7hj8sb7qyd77r255ff78l")
'("llvm-10-unique_function_clang-sa"
"1jys9w2zqk3dasnxqh0qz5ij7rxi6mkgq9pqjsclmamr5169zyan")
;'("llvm-D88630-clang-cmake"
; "0rs6s71nqnjkny7i69gqazhqj5jqfdr0bkxs2v5a55sfx8fa1k54")
'("llvm-11-D85313-debuginfo-empty-arange"
"1f672d5385xpgb8yrim8d3b7wg2z1l81agnshm1q61kdvjixqx32")
'("llvm-11-D90722-rtdyld-absolute-relocs"
"0kmnai229yyxkmpk9lxd180mcnhk2i8d87k2sg89gc8as18w10r6")
'("llvm-invalid-addrspacecast-sink"
"1n1b7j4s80vj7x5377aj9vyphmxx1q6bm0chhkxp6zsy3mx3g2ry")
'("llvm-11-D92906-ppc-setjmp"
"0cmd4dsblp7a8m03j16dqxws0ijh55zf4jzzxmj341qxa1gamdp9")
'("llvm-11-PR48458-X86ISelDAGToDAG"
"0vwzvlhsdazhxg4gj8g2f00a4f8qc5cgac23w575xk3pgba1jh6y")
'("llvm-11-D93092-ppc-knownbits"
"1748bypsc7c9lbs3fnkv0kwvch6bn85kj98j4jdaz254ig0wa6xj")
'("llvm-11-D93154-globalisel-as"
"1k5wd4z3pa7zj0gyjkif7viqj906dhqlbb7dc95gig40nbxv6zpj")
'("llvm-11-ppc-half-ctr"
"0piywisfz6cmw3133kz7vzhiqflq2y7igakqxlym0gi8pqylv7w9")
'("llvm-11-ppc-sp-from-bp"
"1wmg3485cx5f9pbykyl3jibk1wwv4w1x30hl4jyfndzr2yh8azf9")
'("llvm-rGb498303066a6-gcc11-header-fix"
"0hkd4rwhvh8g2yh13g29wiwnjpv2yd1hdyiv1ryw8izl25bz9c67")
'("llvm-11-D94813-mergeicmps"
"0cmy0ywkgyrdcvr9bd6pd912lyd4gcsrib4z0v05dwgcdxhk7y29")
'("llvm-11-D94980-CTR-half"
"1yf8cxib3z8hz7zi9n6v2g2c6vpfr4slq9hpx8m8yq8f1jbyw3fw")
'("llvm-11-D94058-sext-atomic-ops"
"1x6p6k6q651z5jcqxx8vj17cxnv196mka7mwn7dpp6c23lwgfdpb")
'("llvm-11-D96283-dagcombine-half"
"0lv4iq2f8qrcz1xyxfic3bcr5p0aqam3a7c6pp6fnw3riixm096k"))))
(patch-flags '("-p1"))))
(inherit llvm-13)
(arguments
(substitute-keyword-arguments (package-arguments llvm-11)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-round-two
;; We have to do the patching in two rounds because we can't
;; pass '-p1' and '-p2' in the source field.
(lambda* (#:key inputs #:allow-other-keys)
(map (lambda (patchname)
(invoke "patch" patchname "-p2"))
(list "llvm-11-AArch64-FastIsel-bug"
"llvm-11-D97435-AArch64-movaddrreg"
"llvm-11-D97571-AArch64-loh"
"llvm-11-aarch64-addrspace"))))))
((#:build-type _) "Release")
((#:configure-flags flags)
`(list
;; Build a native compiler and the NVPTX backend (NVIDIA) since
;; Julia insists on it, nothing more. This reduces build times and
;; disk usage.
,(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=NVPTX"
"-DLLVM_INSTALL_UTILS=ON"
"-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"
;; "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
"-DLLVM_ENABLE_DUMP=ON"
"-DLLVM_LINK_LLVM_DYLIB=ON"
"-DLLVM_VERSION_SUFFIX:STRING=jl"))))
(inputs
(append
(package-inputs llvm-11)
`(("llvm-11-AArch64-FastIsel-bug"
,(julia-patch "llvm-11-AArch64-FastIsel-bug"
"1m2vddj1mw4kbij8hbrx82piyy6bvr2x7wwdnlxfaqcm72ipzyh9"))
("llvm-11-D97435-AArch64-movaddrreg"
,(julia-patch "llvm-11-D97435-AArch64-movaddrreg"
"10jnavq9ljkj7j2gqj2zd1pwqpqb5zs3zp9h96pmz0djbmxwa86y"))
("llvm-11-D97571-AArch64-loh"
,(julia-patch "llvm-11-D97571-AArch64-loh"
"128zcbg1w1j7hngsf7z1a7alc6lig6l2rqgjp6i8nk3k3f842v6n"))
("llvm-11-aarch64-addrspace"
,(julia-patch "llvm-11-aarch64-addrspace"
"0ckbzgfirxrf2d5bpinpngp7gnilbjrk0cbdfyl3h6f5v6i6xj6m")))))))
(substitute-keyword-arguments (package-arguments llvm-13)
((#:configure-flags flags ''())
#~(cons* "-DLLVM_BUILD_LLVM_DYLIB=ON"
"-DLLVM_LINK_LLVM_DYLIB=ON"
;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=NVPTX"
"-DLLVM_VERSION_SUFFIX:STRING=jl" ; Perhaps not needed.
#$(string-append "-DLLVM_TARGETS_TO_BUILD="
(system->llvm-target))
(delete "-DBUILD_SHARED_LIBS:BOOL=TRUE" #$flags)))
((#:build-type _) "Release")))
(properties `((hidden? . #t)
,@(package-properties llvm-13)))))
(define %cling-version "0.9")