From f4735ccf9bb5ff521215e9ffa60244a585be3446 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 30 Nov 2023 12:33:46 +0200 Subject: gnu: libclc: Update to 15.0.7. * gnu/packages/llvm.scm (libclc): Update to 15.0.7. [source]: Use the llvm-monorepo. [arguments]: Remove configure-flag for python, add one for llvm-spirv. Add a phase to skip 2 tests. Remove trailing #t from phases. [propagated-inputs]: Add spirv-llvm-translator, spirv-tools. [native-inputs]: Replace clang-9 with 15, llvm-9 with 15. [properties]: Add release-monitoring-url. Change-Id: I06e2e7be0dc5733a2cc17429928b1761ab987906 --- gnu/packages/llvm.scm | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'gnu/packages/llvm.scm') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 6bd52969e6..d0a5e1b71b 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -73,6 +73,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages swig) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xml) #:use-module (srfi srfi-1) #:use-module (ice-9 match) @@ -1946,37 +1947,37 @@ standard C++ library.") (define-public libclc (package (name "libclc") - (version "9.0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/llvm/llvm-project") - (commit (string-append "llvmorg-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1d1qayvrvvc1di7s7jfxnjvxq2az4lwq1sw1b2gq2ic0nksvajz0")))) + (version (package-version llvm-15)) + (source (llvm-monorepo version)) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "-DLLVM_CLANG=" - (assoc-ref %build-inputs "clang") - "/bin/clang") - (string-append "-DPYTHON=" - (assoc-ref %build-inputs "python") - "/bin/python3")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "libclc") #t))))) + (list + #:configure-flags + #~(list (string-append "-DLLVM_CLANG=" + (assoc-ref %build-inputs "clang") + "/bin/clang") + (string-append "-DLLVM_SPIRV=" + (assoc-ref %build-inputs "spirv-llvm-translator") + "/bin/llvm-spirv")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'enter-subdirectory + (lambda _ + (chdir "libclc"))) + (add-after 'enter-subdirectory 'skip-clspv-tests + (lambda _ + (substitute* "CMakeLists.txt" + (("ptx\\.\\*") "[ptx|clspv].*"))))))) + (propagated-inputs + (list spirv-llvm-translator spirv-tools)) (native-inputs - (list clang-9 llvm-9 python)) + (list clang-15 llvm-15 python)) (home-page "https://libclc.llvm.org") (synopsis "Libraries for the OpenCL programming language") (description "This package provides an implementation of the OpenCL library requirements according to version 1.1 of the OpenCL specification.") + (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))) ;; Apache license 2.0 with LLVM exception (license license:asl2.0))) -- cgit v1.2.3 From 95b577e09ae4e8a0463dbce23bc6f41e7a01ccce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Dec 2023 09:50:18 +0200 Subject: gnu: llvm: Export clang-properties. * gnu/packages/llvm.scm (clang-properties): Export variable. Change-Id: If5ef5219c3d29a347ae5ad97584c23bafdabf836 --- gnu/packages/llvm.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/llvm.scm') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d0a5e1b71b..56e2279f69 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -78,7 +78,8 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (make-lld-wrapper - system->llvm-target)) + system->llvm-target + clang-properties)) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) -- cgit v1.2.3 From 2e11caff39d502775d7c652972a441f5da3d9eec Mon Sep 17 00:00:00 2001 From: Michael Ford Date: Tue, 5 Dec 2023 10:49:29 +0000 Subject: gnu: LLVM, Clang, libomp, lld: Update to 17.0.6. * gnu/packages/llvm.scm (llvm-17, clang-17, libomp-17, lld-17): Update to 17.0.6. Signed-off-by: Hilton Chain Change-Id: I7757b8e55e6a7ffc8185d366ba77706abaf5a798 --- gnu/packages/llvm.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/llvm.scm') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 56e2279f69..08536fc865 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -603,13 +603,13 @@ output), and Binutils.") '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2") ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky") - ("17.0.5" . "149flpr96vcn7a1ckya6mm93m9yp85l47w156fjd0r99ydxrw5kv"))) + ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) ("15.0.7" . ("clang-15.0-libc-search-path.patch")) ("16.0.6" . ("clang-16.0-libc-search-path.patch")) - ("17.0.5" . ("clang-17.0-libc-search-path.patch")))) + ("17.0.6" . ("clang-17.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -1502,7 +1502,7 @@ Library.") (define-public llvm-17 (package (inherit llvm-15) - (version "17.0.5") + (version "17.0.6") (source (llvm-monorepo version)))) (define-public clang-runtime-17 @@ -1518,7 +1518,7 @@ Library.") (package-version llvm-17))) (sha256 (base32 - "12dbp10bhq25a44qnvz978mf9y6pdycwpp7sgq8a93by0fpgb72r"))))) + "1f8szx762c325916gjxb5lw7zxyidynwnvx6fxxqscsx8514cxxa"))))) (define-public libomp-17 (package -- cgit v1.2.3 From 556aa310505276c11dee54822e0f8eb1017e69de Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 9 Dec 2023 18:41:18 +0200 Subject: gnu: llvm-14: Fix building on powerpc-linux. * gnu/packages/llvm.scm (llvm-14)[arguments]: When building for powerpc-linux adjust the configure-flags to always link shared libraries with -latomic. Change-Id: If020528bf1717595b66e6e0826dbe7a0c1128322 --- gnu/packages/llvm.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/llvm.scm') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 08536fc865..a84b8c0030 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -706,6 +706,10 @@ of programming tools as well as libraries with equivalent functionality.") #$(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))) '()) + ;; undefined reference to `__atomic_fetch_add_8' in lib/libLLVMOrcJIT.so.14 + #$@(if (target-ppc32?) + (list "-DCMAKE_SHARED_LINKER_FLAGS=-latomic") + `()) "-DCMAKE_SKIP_BUILD_RPATH=FALSE" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" "-DBUILD_SHARED_LIBS:BOOL=TRUE" -- cgit v1.2.3