From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 16 04:14:00 2024 Received: (at submit) by debbugs.gnu.org; 16 Nov 2024 09:14:00 +0000 Received: from localhost ([127.0.0.1]:52091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCEsS-0007aS-2U for submit@debbugs.gnu.org; Sat, 16 Nov 2024 04:14:00 -0500 Received: from lists.gnu.org ([209.51.188.17]:43674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCEsP-0007aG-CI for submit@debbugs.gnu.org; Sat, 16 Nov 2024 04:13:58 -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 1tCEsO-0007Sh-Rk for guix-patches@gnu.org; Sat, 16 Nov 2024 04:13:56 -0500 Received: from fhigh-b8-smtp.messagingengine.com ([202.12.124.159]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tCEsM-0003kj-Mn for guix-patches@gnu.org; Sat, 16 Nov 2024 04:13:56 -0500 Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfhigh.stl.internal (Postfix) with ESMTP id 5AF48254012D for ; Sat, 16 Nov 2024 04:13:51 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Sat, 16 Nov 2024 04:13:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm1; t=1731748431; x=1731834831; bh=JiLVDWOgrM8WU/IU7rKWa ijahobU8/ntKJx34AHEONA=; b=SJSdHaxstdVDu6Px8dBIiet2ZuRmOo/xtaa0N KsK3luCSK9fFVjFGj046eh8Ng0CrSE/XIMIzaqRQJI/cGhwvywF1K4Bolf4ZNonm oCHpBYgHulpmnxGvfXra2pH44eTTmhx8PaT6wH7Qa6EqcYJOzxZZYm5erNU/MvaK 7MArn0Whe+Nt02MsDyySrpeBHjRnziZk+aNrb7BjtDTWQ9g9lb5yD52oyAQpG6Hk hiUnYUFIogwqdoJ66Eaae6wKei47HFZmZpEJH9HEh06IQuQt507ty6CykVvbzNAQ eNym+cN9Ct0a2Ve0gVL+ya8FdDVShMMD+otjjV1+8OzkOREug== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1731748431; x=1731834831; bh=JiLVDWOgrM8WU/IU7rKWaijahobU8/ntKJx 34AHEONA=; b=fZS187GIDx6R4DOvoleDmwCBSiaVUYG/NSSoj+CJNYyMu6unH1C Oa8CSiH587VOwRHNpSuPBP9ZWdH4mAILhxsiMkTY1WrnuZFePjviNzvJ0lMbojTI s/XLiEw65GaDkMkTqWKKNHeLHVm7MmX0uPXRNplwkgbiecNRm6vl8Y/vH/Y2VaK7 PxjePiEx6b4yHjbe+HB0WfaceTcDHvsPBS0Ix9YZoslVsiJ+htgWDtRfpaUY94gj LqgpRDUBLE9qCEPbI3HUla2xrUq5HM8MZcDuLX+tJNI+pJTjzq5v6eA4SQrmeV1K HXq9xGmqOtzXu3E1lQ/MLDdvBjNmeNkcukA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrvdeiucetufdoteggodetrfdotffvucfrrh hofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfurfetoffk rfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggf estdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucgg tffrrghtthgvrhhnpeduuefgkeevudejudetgfekhfeigfehffefheelvddtffehtedvje evkeejkefgkeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnhdrghgrmhgvshdpnh gspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhuihig qdhprghttghhvghssehgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 16 Nov 2024 04:13:49 -0500 (EST) From: dan To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: Add llvm-19. Date: Sat, 16 Nov 2024 17:13:26 +0800 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=202.12.124.159; envelope-from=i@dan.games; helo=fhigh-b8-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/llvm.scm (clang-runtime-from-llvm)[native-inputs]: When building clang-runtime-19 or newer use gcc-14. (clang-from-llvm)[#:configure-flags]: When building clang-19 or newer, pass in USE_DEPRECATED_GCC_INSTALL_PREFIX. (%llvm-monorepo-hashes): Add entry for llvm-19. (llvm-19, clang-runtime-19, clang-19, libomp-19, clang-toolchain-19): New variables. Change-Id: I55630c3ecd2e6caa4237f28ac9f41726ed09eec4 --- gnu/packages/llvm.scm | 59 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c6566a3339..1b3fd27dd6 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -154,7 +154,12 @@ (define* (clang-runtime-from-llvm llvm (llvm-monorepo (package-version llvm)))) (build-system cmake-build-system) (native-inputs - (cond ((version>=? version "18") + (cond ((version>=? version "19") + ;; TODO: Remove this when GCC 14 is the default. + ;; libfuzzer fails to build with GCC 13 + (modify-inputs (package-native-inputs llvm) + (prepend gcc-14))) + ((version>=? version "18") ;; TODO: Remove this when GCC 13 is the default. ;; libfuzzer fails to build with GCC 12 (modify-inputs (package-native-inputs llvm) @@ -261,6 +266,11 @@ (define* (clang-from-llvm llvm clang-runtime `(#:configure-flags (list "-DCLANG_INCLUDE_TESTS=True" + ;; TODO: Use --gcc-install-dir when GCC_INSTALL_PREFIX is + ;; removed. See: https://github.com/llvm/llvm-project/pull/77537 + ,@(if (version>=? version "19") + '("-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON") + '()) ;; Find libgcc_s, crtbegin.o, and crtend.o. (string-append "-DGCC_INSTALL_PREFIX=" (assoc-ref %build-inputs "gcc-lib")) @@ -552,7 +562,8 @@ (define %llvm-monorepo-hashes ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2") ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky") ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh") - ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la"))) + ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la") + ("19.1.3" . "051miidbiqz4d2m1kk5w2am0hayjymbvc9pgjcjq7cadwbap8k1m"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch" @@ -565,6 +576,8 @@ (define %llvm-patches ("17.0.6" . ("clang-17.0-libc-search-path.patch" "clang-17.0-link-dsymutil-latomic.patch")) ("18.1.8" . ("clang-18.0-libc-search-path.patch" + "clang-17.0-link-dsymutil-latomic.patch")) + ("19.1.3" . ("clang-18.0-libc-search-path.patch" "clang-17.0-link-dsymutil-latomic.patch")))) (define (llvm-monorepo version) @@ -1536,6 +1549,48 @@ (define-public libomp-18 (define-public clang-toolchain-18 (make-clang-toolchain clang-18 libomp-18)) +(define-public llvm-19 + (package + (inherit llvm-15) + (version "19.1.3") + (source (llvm-monorepo version)) + (arguments + (substitute-keyword-arguments (package-arguments llvm-15) + ;; The build daemon goes OOM on i686-linux on this phase. + ((#:phases phases #~'%standard-phases) + (if (target-x86-32?) + #~(modify-phases #$phases + (delete 'make-dynamic-linker-cache)) + phases)))))) + +(define-public clang-runtime-19 + (clang-runtime-from-llvm llvm-19)) + +(define-public clang-19 + (clang-from-llvm + llvm-19 clang-runtime-19 + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-19))) + (sha256 + (base32 + "0ig3syx0m9hcjzr4yl568jv2rz3haadgr9nhv8jv0gspx55ywn33"))))) + +(define-public libomp-19 + (package + (inherit libomp-15) + (version (package-version llvm-19)) + (source (llvm-monorepo version)) + (native-inputs + (modify-inputs (package-native-inputs libomp-15) + (replace "clang" clang-19) + (replace "llvm" llvm-19))))) + +(define-public clang-toolchain-19 + (make-clang-toolchain clang-19 libomp-19)) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) base-commit: 3e8d3d80f41e016cdfe80e488a78c2351c94fef8 -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 16 04:16:24 2024 Received: (at 74380) by debbugs.gnu.org; 16 Nov 2024 09:16:24 +0000 Received: from localhost ([127.0.0.1]:52106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCEum-0007lq-2x for submit@debbugs.gnu.org; Sat, 16 Nov 2024 04:16:24 -0500 Received: from fout-b6-smtp.messagingengine.com ([202.12.124.149]:58059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCEuk-0007lQ-8E for 74380@debbugs.gnu.org; Sat, 16 Nov 2024 04:16:23 -0500 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.stl.internal (Postfix) with ESMTP id C7F131140121 for <74380@debbugs.gnu.org>; Sat, 16 Nov 2024 04:16:16 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Sat, 16 Nov 2024 04:16:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1731748576; x= 1731834976; bh=JnvXbf17JrXe/QJq7mfGjNDF5rhsaBVu90kRABGiSF4=; b=O D70OasYwUZkhizYHXHEfL1I2V1qE9wEPlO1/PtnhwEeTpfGCkHPmlATYfnCJwY3W 1MiPGePgowYZhsK08mkvWLtaK+bHj7pUfgidoRZcZFvnApSt6v7DovJgIOy3wM2L c1wAroM4p2tLOumbGLnn7qNvX6aK/UMDNOi88P+Kng4JpBdAV7DVC7Vza8OL8PqE IuSSEQPtZrUX4kGp9YvmGzliqY8CTAVaYm7MxcrpbeQxKdhCq+Vb93epLTs2mpz6 xXQCEXDuHk0JTkVBVbwlYake1YH8qVAe5ZakUv4D9h3KHtKsvwssVton60LfOFGI qYODrbKNkfk1x56Lu20jQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1731748576; x=1731834976; bh=JnvXbf17JrXe/QJq7mfGjNDF5rhs aBVu90kRABGiSF4=; b=oWOHEKSRsqHpJQANq8p5dXjGs1qdRlVn5vvjjimhfCA3 jM5gpuWDfkObqhA22kR9SmbB1jMgiDX6Z+nrSBP3H3h1gi8HSUVvSGnTjNZo228C TRlNcee1AECp2ebe9LS3AZZkcAXYhL2j+sXpXHQM/BralHGUbixUtZET2LAkT6Iq sRo6d19lysWxoO9Ui1H/BQ4RwyEqqk4wEau1M3ovIW1AiS+BKJvRgL04UilRYGob Ca9DaFIikqQB8KqWNi3iFmZjFsahh5twucEt1tI/OI47D7sWXmfOuMU5NFkxiHqP mIkemWNzSTsLp5NGME+9rU3OQ/2JxbB6Mk5Bs9qlJg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrvdeiucetufdoteggodetrfdotffvucfrrh hofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfurfetoffk rfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfh gggfestdekredtredttdenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeen ucggtffrrghtthgvrhhnpeeffffftdehteetvdelieehgeehtedvteethefgteeivdetge egtdejtdduudeludenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehisegurghnrdhgrghmvghspdhnsggprhgtphhtthhopedupdhmohguvgepsh hmthhpohhuthdprhgtphhtthhopeejgeefkedtseguvggssghughhsrdhgnhhurdhorhhg X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <74380@debbugs.gnu.org>; Sat, 16 Nov 2024 04:16:15 -0500 (EST) From: dan To: 74380@debbugs.gnu.org Subject: [PATCH 2/2] gnu: Add lld-19. Date: Sat, 16 Nov 2024 17:16:06 +0800 Message-ID: <20b0e0012901fba013f430e51998af01a1b96d5a.1731748323.git.i@dan.games> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: dan Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 74380 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/llvm.scm (lld-19): New variable. Change-Id: I8d24e762fc7837f5d3ade91801c3ffc0a5cb84a9 --- gnu/packages/llvm.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 1b3fd27dd6..112215663f 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1756,6 +1756,13 @@ (define-public lld-18 (source (llvm-monorepo version)) (inputs (list llvm-18)))) +(define-public lld-19 + (package + (inherit lld-15) + (version (package-version llvm-19)) + (source (llvm-monorepo version)) + (inputs (list llvm-19)))) + (define-public lld lld-14) (define* (make-lld-wrapper lld #:key lld-as-ld?) -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 23 20:11:39 2024 Received: (at 74380-done) by debbugs.gnu.org; 24 Nov 2024 01:11:39 +0000 Received: from localhost ([127.0.0.1]:59995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF1A3-0001Pl-5j for submit@debbugs.gnu.org; Sat, 23 Nov 2024 20:11:39 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:39816 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF1A0-0001PT-3P for 74380-done@debbugs.gnu.org; Sat, 23 Nov 2024 20:11:38 -0500 Received: from m (unknown [107.174.64.25]) by APP-05 (Coremail) with SMTP id zQCowABXX384fUJn0hdIBQ--.54973S2; Sun, 24 Nov 2024 09:11:24 +0800 (CST) From: Z572 To: dan Subject: Re: [bug#74380] [PATCH 1/2] gnu: Add llvm-19. In-Reply-To: (dan's message of "Sat, 16 Nov 2024 17:13:26 +0800") References: Date: Sun, 24 Nov 2024 09:11:19 +0800 Message-ID: <87mshp5tc8.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-CM-TRANSID: zQCowABXX384fUJn0hdIBQ--.54973S2 X-Coremail-Antispam: 1UD129KBjvJXoWxXw4rKw1fur47KrykurWDXFb_yoWrurWxpF W8ZFy5Kr48trn3Xan3KFsFgF4rWa18Ar48CF47Aw40kFs8Kay8trWkKayakF47Jws2ka17 Wrs5ZF4DGrWUGFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvmb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8JVWxJwA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I262IY c4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2 WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkE bVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJV W8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF 1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6x IIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvE x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnU UI43ZEXa7IUeAHUPUUUUU== X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74380-done Cc: 74380-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable dan writes: > * gnu/packages/llvm.scm (clang-runtime-from-llvm)[native-inputs]: When > building clang-runtime-19 or newer use gcc-14. > (clang-from-llvm)[#:configure-flags]: When building clang-19 or newer, pa= ss in > USE_DEPRECATED_GCC_INSTALL_PREFIX. > (%llvm-monorepo-hashes): Add entry for llvm-19. > (llvm-19, clang-runtime-19, clang-19, libomp-19, clang-toolchain-19): New > variables. > > Change-Id: I55630c3ecd2e6caa4237f28ac9f41726ed09eec4 > --- > gnu/packages/llvm.scm | 59 +++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 57 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm > index c6566a3339..1b3fd27dd6 100644 > --- a/gnu/packages/llvm.scm > +++ b/gnu/packages/llvm.scm > @@ -154,7 +154,12 @@ (define* (clang-runtime-from-llvm llvm > (llvm-monorepo (package-version llvm)))) > (build-system cmake-build-system) > (native-inputs > - (cond ((version>=3D? version "18") > + (cond ((version>=3D? version "19") > + ;; TODO: Remove this when GCC 14 is the default. > + ;; libfuzzer fails to build with GCC 13 > + (modify-inputs (package-native-inputs llvm) > + (prepend gcc-14))) > + ((version>=3D? version "18") > ;; TODO: Remove this when GCC 13 is the default. > ;; libfuzzer fails to build with GCC 12 > (modify-inputs (package-native-inputs llvm) > @@ -261,6 +266,11 @@ (define* (clang-from-llvm llvm clang-runtime > `(#:configure-flags > (list "-DCLANG_INCLUDE_TESTS=3DTrue" >=20=20 > + ;; TODO: Use --gcc-install-dir when GCC_INSTALL_PREFIX is > + ;; removed. See: https://github.com/llvm/llvm-project/pull= /77537 > + ,@(if (version>=3D? version "19") > + '("-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=3DON") > + '()) > ;; Find libgcc_s, crtbegin.o, and crtend.o. > (string-append "-DGCC_INSTALL_PREFIX=3D" > (assoc-ref %build-inputs "gcc-lib")) > @@ -552,7 +562,8 @@ (define %llvm-monorepo-hashes > ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2") > ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky") > ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh") > - ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la"))) > + ("18.1.8" . "1l9wm0g9jrpdf309kxjx7xrzf13h81kz8bbp0md14nrz38qll9la") > + ("19.1.3" . "051miidbiqz4d2m1kk5w2am0hayjymbvc9pgjcjq7cadwbap8k1m"))) >=20=20 > (define %llvm-patches > '(("14.0.6" . ("clang-14.0-libc-search-path.patch" > @@ -565,6 +576,8 @@ (define %llvm-patches > ("17.0.6" . ("clang-17.0-libc-search-path.patch" > "clang-17.0-link-dsymutil-latomic.patch")) > ("18.1.8" . ("clang-18.0-libc-search-path.patch" > + "clang-17.0-link-dsymutil-latomic.patch")) > + ("19.1.3" . ("clang-18.0-libc-search-path.patch" > "clang-17.0-link-dsymutil-latomic.patch")))) >=20=20 > (define (llvm-monorepo version) > @@ -1536,6 +1549,48 @@ (define-public libomp-18 > (define-public clang-toolchain-18 > (make-clang-toolchain clang-18 libomp-18)) >=20=20 > +(define-public llvm-19 > + (package > + (inherit llvm-15) > + (version "19.1.3") > + (source (llvm-monorepo version)) > + (arguments > + (substitute-keyword-arguments (package-arguments llvm-15) > + ;; The build daemon goes OOM on i686-linux on this phase. > + ((#:phases phases #~'%standard-phases) > + (if (target-x86-32?) > + #~(modify-phases #$phases > + (delete 'make-dynamic-linker-cache)) > + phases)))))) > + > +(define-public clang-runtime-19 > + (clang-runtime-from-llvm llvm-19)) > + > +(define-public clang-19 > + (clang-from-llvm > + llvm-19 clang-runtime-19 > + #:tools-extra > + (origin > + (method url-fetch) > + (uri (llvm-uri "clang-tools-extra" > + (package-version llvm-19))) > + (sha256 > + (base32 > + "0ig3syx0m9hcjzr4yl568jv2rz3haadgr9nhv8jv0gspx55ywn33"))))) > + > +(define-public libomp-19 > + (package > + (inherit libomp-15) > + (version (package-version llvm-19)) > + (source (llvm-monorepo version)) > + (native-inputs > + (modify-inputs (package-native-inputs libomp-15) > + (replace "clang" clang-19) > + (replace "llvm" llvm-19))))) > + > +(define-public clang-toolchain-19 > + (make-clang-toolchain clang-19 libomp-19)) > + > ;; Default LLVM and Clang version. > (define-public libomp libomp-13) > (define-public llvm llvm-13) > > base-commit: 3e8d3d80f41e016cdfe80e488a78c2351c94fef8 pushed, and update to 19.1.4, closing. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmdCfTcACgkQO1qpk+Gi 3/ClJxAAgOTFHHRdlAsVL0rmUjcS/H5tSYiwQ8Y8XS/k1XV0gBiPhG9TcZdduLm6 tf47sZiPfmYxXIhRtNiKEib8X41o4n9r3J5SzqBexAuVNwg2Hgi2mnegknzZpO0f +Wgk1QVP35Q4HmprsDSYK024WIizRxXdRkAbPFoDSYY2bCqefmy8Rd8r/WDzK0x/ TJlM1g4l5cb+m2AHbW9wAuWxzjofkdU+MxuyS95BXKsUJAzchV92KUG6BdLuuuJK n959qAvTI+yNYzfk3mPgAL4iAtLvyTig7BtHeuIn6W43oIIOtm1Zh4AhwnFUso2z 9Dvu9p5+E7PtFWw4WDxJ4wxMc6mN/PFp6Fn4u1PGUUGep01Q8x8yFkk4YbV1SwTT M24VZ2HrphC2ff3zj+iILeaRFeQ6L7OVHdafnb9yxA7P/Aapur8Qq3fGLmJt+FHi dNsBdBlrvE1A/esACooqy5VEWR01Olc2BaTpC21qaYl5d0cW/A80ld/8XibO/POK SYoxkM4IWIpC3GzCDZG8wpczX23T7tq9l+id5ASAfPxWShwKyY3PDW3YXg5kLEIA 3esSfm5z7HRwBfKgz+lBH+LbqKc+sg2oDO/d8OnNcfYeJzkdjVTolYs7I9IuWB/R Fp/emQnrJkZvGcB7VkmLDwqF9paGaoO6XD8iQmgmKi8VxR+MM+A= =ldbY -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jun 21 03:27:11 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 22 Dec 2024 12:24:15 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator