From patchwork Wed Mar 5 10:33:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 39706 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D1AAA27BBEA; Wed, 5 Mar 2025 10:35:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D32527BBE9 for ; Wed, 5 Mar 2025 10:35:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpm5h-0005UY-Hu; Wed, 05 Mar 2025 05:35:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpm5f-0005S7-O3 for guix-patches@gnu.org; Wed, 05 Mar 2025 05:35:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpm5f-0005NS-Er for guix-patches@gnu.org; Wed, 05 Mar 2025 05:35:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=aqfzwB4KNZCq8FBKbMbqSNnUwKqzM0w2XEH6l14fLec=; b=EtI1eGnB60B4J4261xJj1BImchClz0eoeoX9oIEI6lwebAfugQgRukzPWsfpOQRGhMkz3OANQSVwvUYeJGEc/QXn+vNW5SHmBJe4D8E7j+etRDLEFEM2CmOF3ApEu37xClyS6RhiDrv8mFABQ8+HRSEtooFfjFFi6x/y7FSABmR5E6ukshzHat8WIpLhILLkjKxSxoLuaMYeXCF8rxTozgkO32W3gkL+2+McqfacMXnGakjnM5EA8WML7Hy2byczRpOdsyXU4YUodqSmZLkfwVhwo4kYrKgfesFPbq2cZSXaxDl0aM7j0cX5WTwR2dXDgOUkjC1Yw33JVj1scMhJrw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tpm5e-00074v-6p for guix-patches@gnu.org; Wed, 05 Mar 2025 05:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76762] [PATCH] gnu: Add llvm-20. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Mar 2025 10:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76762 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76762@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174117085827099 (code B ref -1); Wed, 05 Mar 2025 10:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Mar 2025 10:34:18 +0000 Received: from localhost ([127.0.0.1]:35635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tpm4v-00072z-PY for submit@debbugs.gnu.org; Wed, 05 Mar 2025 05:34:18 -0500 Received: from lists.gnu.org ([2001:470:142::17]:55970) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tpm4s-00072c-LB for submit@debbugs.gnu.org; Wed, 05 Mar 2025 05:34:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpm4m-0005ND-F6 for guix-patches@gnu.org; Wed, 05 Mar 2025 05:34:08 -0500 Received: from mail.z572.online ([88.99.160.180]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpm4k-0005Ic-92 for guix-patches@gnu.org; Wed, 05 Mar 2025 05:34:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1741171183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqfzwB4KNZCq8FBKbMbqSNnUwKqzM0w2XEH6l14fLec=; b=HfnIXYFCuMnxzMFWvalyXazqkhAM927pKUcC9AQYm7nA8erV9KUs2zBq5ojQ5H4Bdc71UJ vAb3olgfZFG1gs0vUUvqdRmabCuLsGdOVwSebkNOB80cX/1pkH2VbviMVEywLhF1PxUwKk SCa6fdJLCJhCLytSKU0dkD5+11zn2JU= Received: from m.tailaa68d.ts.net (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 6ca13770 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 5 Mar 2025 10:39:41 +0000 (UTC) From: Zheng Junjie Date: Wed, 5 Mar 2025 18:33:52 +0800 Message-ID: <510e6f5871f902b5892293d0e3984ff85b1600a9.1741170832.git.z572@z572.online> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=88.99.160.180; envelope-from=z572@z572.online; helo=mail.z572.online X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.001, FROM_SUSPICIOUS_NTLD_FP=0.001, PDS_OTHER_BAD_TLD=1.982, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: a69a33645183fa3d55d54fe1534a9bb2a33a24a4 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 ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2023 Hilton Chain -;;; Copyright © 2023-2025 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023-2025 Zheng Junjie ;;; ;;; 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)