GNU bug report logs - #76762
[PATCH] gnu: Add llvm-20.

Previous Next

Package: guix-patches;

Reported by: Zheng Junjie <z572 <at> z572.online>

Date: Wed, 5 Mar 2025 10:35:01 UTC

Severity: normal

Tags: patch

Done: Z572 <z572 <at> z572.online>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76762 in the body.
You can then email your comments to 76762 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#76762; Package guix-patches. (Wed, 05 Mar 2025 10:35:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Zheng Junjie <z572 <at> z572.online>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 05 Mar 2025 10:35:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <z572 <at> z572.online>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: Add llvm-20.
Date: Wed,  5 Mar 2025 18:33:52 +0800
* gnu/packages/llvm.scm (%llvm-monorepo-hashes): Add entry for llvm-20.
(%llvm-patches): Add entry for llvm-20.
(llvm-20, clang-runtime-20, clang-20, libomp-20, clang-toolchain-20):
New variables.

Change-Id: Ia49a4829f73f17dd78933838470ca70241927102
---
 gnu/packages/llvm.scm | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index f1058ebbc95..d352f5bf6f8 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -26,7 +26,7 @@
 ;;; Copyright © 2022 Clément Lassieur <clement <at> lassieur.org>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
 ;;; Copyright © 2023 Hilton Chain <hako <at> ultrarare.space>
-;;; Copyright © 2023-2025 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2023-2025 Zheng Junjie <z572 <at> z572.online>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -568,7 +568,8 @@ (define %llvm-monorepo-hashes
     ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky")
     ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh")
     ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la")
-    ("19.1.7" . "18hkfhsm88bh3vnj21q7f118vrcnf7z6q1ylnwbknyb3yvk0343i")))
+    ("19.1.7" . "18hkfhsm88bh3vnj21q7f118vrcnf7z6q1ylnwbknyb3yvk0343i")
+    ("20.1.0" . "1ny66g8g186scb3mxqy5hdxbs03rrf1qs1y6smf7574vidxpr9pk")))
 
 (define %llvm-patches
   '(("14.0.6" . ("clang-14.0-libc-search-path.patch"
@@ -583,6 +584,8 @@ (define %llvm-patches
     ("18.1.8" . ("clang-18.0-libc-search-path.patch"
                  "clang-17.0-link-dsymutil-latomic.patch"))
     ("19.1.7" . ("clang-18.0-libc-search-path.patch"
+                 "clang-17.0-link-dsymutil-latomic.patch"))
+    ("20.1.0" . ("clang-18.0-libc-search-path.patch"
                  "clang-17.0-link-dsymutil-latomic.patch"))))
 
 (define (llvm-monorepo version)
@@ -1605,6 +1608,37 @@ (define-public libomp-19
 (define-public clang-toolchain-19
   (make-clang-toolchain clang-19 libomp-19))
 
+(define-public llvm-20
+  (make-llvm "20.1.0"))
+
+(define-public clang-runtime-20
+  (clang-runtime-from-llvm llvm-20))
+
+(define-public clang-20
+  (clang-from-llvm
+   llvm-20 clang-runtime-20
+   #:tools-extra
+   (origin
+     (method url-fetch)
+     (uri (llvm-uri "clang-tools-extra"
+                    (package-version llvm-20)))
+     (sha256
+      (base32
+       "19ksp5qnl5p5jqywfvvff8jjb0vbwmj33q58g1nhyj1ik48h9rcq")))))
+
+(define-public libomp-20
+  (package
+    (inherit libomp-15)
+    (version (package-version llvm-20))
+    (source (llvm-monorepo version))
+    (native-inputs
+     (modify-inputs (package-native-inputs libomp-15)
+       (replace "clang" clang-20)
+       (replace "llvm" llvm-20)))))
+
+(define-public clang-toolchain-20
+  (make-clang-toolchain clang-20 libomp-20))
+
 ;; Default LLVM and Clang version.
 (define-public libomp libomp-13)
 (define-public llvm llvm-13)

base-commit: a69a33645183fa3d55d54fe1534a9bb2a33a24a4
-- 
2.48.1





Reply sent to Z572 <z572 <at> z572.online>:
You have taken responsibility. (Fri, 07 Mar 2025 11:25:02 GMT) Full text and rfc822 format available.

Notification sent to Zheng Junjie <z572 <at> z572.online>:
bug acknowledged by developer. (Fri, 07 Mar 2025 11:25:02 GMT) Full text and rfc822 format available.

Message #10 received at 76762-done <at> debbugs.gnu.org (full text, mbox):

From: Z572 <z572 <at> z572.online>
To: 76762-done <at> debbugs.gnu.org
Subject: Re: [bug#76762] [PATCH] gnu: Add llvm-20.
Date: Fri, 07 Mar 2025 19:24:26 +0800
[Message part 1 (text/plain, inline)]
Zheng Junjie <z572 <at> z572.online> writes:

> * gnu/packages/llvm.scm (%llvm-monorepo-hashes): Add entry for llvm-20.
> (%llvm-patches): Add entry for llvm-20.
> (llvm-20, clang-runtime-20, clang-20, libomp-20, clang-toolchain-20):
> New variables.
>
> Change-Id: Ia49a4829f73f17dd78933838470ca70241927102
> ---
>  gnu/packages/llvm.scm | 38 ++++++++++++++++++++++++++++++++++++--
>  1 file changed, 36 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
> index f1058ebbc95..d352f5bf6f8 100644
> --- a/gnu/packages/llvm.scm
> +++ b/gnu/packages/llvm.scm
> @@ -26,7 +26,7 @@
>  ;;; Copyright © 2022 Clément Lassieur <clement <at> lassieur.org>
>  ;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
>  ;;; Copyright © 2023 Hilton Chain <hako <at> ultrarare.space>
> -;;; Copyright © 2023-2025 Zheng Junjie <873216071 <at> qq.com>
> +;;; Copyright © 2023-2025 Zheng Junjie <z572 <at> z572.online>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -568,7 +568,8 @@ (define %llvm-monorepo-hashes
>      ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky")
>      ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh")
>      ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la")
> -    ("19.1.7" . "18hkfhsm88bh3vnj21q7f118vrcnf7z6q1ylnwbknyb3yvk0343i")))
> +    ("19.1.7" . "18hkfhsm88bh3vnj21q7f118vrcnf7z6q1ylnwbknyb3yvk0343i")
> +    ("20.1.0" . "1ny66g8g186scb3mxqy5hdxbs03rrf1qs1y6smf7574vidxpr9pk")))
>  
>  (define %llvm-patches
>    '(("14.0.6" . ("clang-14.0-libc-search-path.patch"
> @@ -583,6 +584,8 @@ (define %llvm-patches
>      ("18.1.8" . ("clang-18.0-libc-search-path.patch"
>                   "clang-17.0-link-dsymutil-latomic.patch"))
>      ("19.1.7" . ("clang-18.0-libc-search-path.patch"
> +                 "clang-17.0-link-dsymutil-latomic.patch"))
> +    ("20.1.0" . ("clang-18.0-libc-search-path.patch"
>                   "clang-17.0-link-dsymutil-latomic.patch"))))
>  
>  (define (llvm-monorepo version)
> @@ -1605,6 +1608,37 @@ (define-public libomp-19
>  (define-public clang-toolchain-19
>    (make-clang-toolchain clang-19 libomp-19))
>  
> +(define-public llvm-20
> +  (make-llvm "20.1.0"))
> +
> +(define-public clang-runtime-20
> +  (clang-runtime-from-llvm llvm-20))
> +
> +(define-public clang-20
> +  (clang-from-llvm
> +   llvm-20 clang-runtime-20
> +   #:tools-extra
> +   (origin
> +     (method url-fetch)
> +     (uri (llvm-uri "clang-tools-extra"
> +                    (package-version llvm-20)))
> +     (sha256
> +      (base32
> +       "19ksp5qnl5p5jqywfvvff8jjb0vbwmj33q58g1nhyj1ik48h9rcq")))))
> +
> +(define-public libomp-20
> +  (package
> +    (inherit libomp-15)
> +    (version (package-version llvm-20))
> +    (source (llvm-monorepo version))
> +    (native-inputs
> +     (modify-inputs (package-native-inputs libomp-15)
> +       (replace "clang" clang-20)
> +       (replace "llvm" llvm-20)))))
> +
> +(define-public clang-toolchain-20
> +  (make-clang-toolchain clang-20 libomp-20))
> +
>  ;; Default LLVM and Clang version.
>  (define-public libomp libomp-13)
>  (define-public llvm llvm-13)
>
> base-commit: a69a33645183fa3d55d54fe1534a9bb2a33a24a4
pushed, closing.
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sat, 05 Apr 2025 11:24:22 GMT) Full text and rfc822 format available.

This bug report was last modified 75 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.