From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id EMAAG4J9QmdHeAEAe85BDQ:P1 (envelope-from ) for ; Sun, 24 Nov 2024 01:12:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id EMAAG4J9QmdHeAEAe85BDQ (envelope-from ) for ; Sun, 24 Nov 2024 02:12:34 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=SDtZOXQ2; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732410754; a=rsa-sha256; cv=none; b=lZfuPtV+jAbM1RU2fNGdAoh0IC2CuUEHYPtT9d3ODRCEmxnj3rWX4IUpqqFPw9AHS27ckp jHn0arW/SlWobcRAmOKDddUIV1aqzoVJr1GAa/kRIUkdcbGIsvOdl8F/YNPf1l2pAXc4xp M2gepNxud3Sv8GzOo4n3jGeFtoO7jUDNZeRAK3bmnANR3MuWHtqihAbTmwIP4XiHMYeUBY o1CUmCImMCo/H0Dd1PeA+7uyTvjsXFgsuahnTKeOzKHNEu/uW1VCM6F8/7BAqapV1mgp2l j0JaxSDTalxND0Ue+EDclBCTuUdQRqKt3z6VzcKCLCCV9Xd4icBxxkhOD0cZvg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=SDtZOXQ2; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732410754; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=9nb7bQhvuN2v2aVtJdehxXzKuQQ2FVaxM4y3cTUlRJA=; b=U8+uGPiN4GwE0wwNaByjnvhzUWeXWuQO60OyV5fpTSlVEIYq1qbUgF9PGduKpJnnCqHeh8 0P4tZyRbklMeFrKljN7vHFNqcHvs0Qj00xTziN1XGvInXM1hox2t/YXQ9twUKJXGMh5Q/B mC7Pf83/+eGAvQC2aDM+vAyIZmA6dH7a6yjygDJp8JBAaTPVy2EYmzTOLwt2yThDcWfSJs ulcCiXgfGtN/YoElp1dsLt7slccG4rF5jFgAUppOrw9fxCtDO12rihJlYy0g0KHEyAnUKK BRiiwle6t1l0e2WkjWlQA9CTTu8Dhuniej2uXG4aNQfP5MVFsdShAy6sPsaWGQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BC75A8298E for ; Sun, 24 Nov 2024 02:12:32 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF1AT-00006R-Iq; Sat, 23 Nov 2024 20:12:05 -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 1tF1AQ-000064-Nu for guix-patches@gnu.org; Sat, 23 Nov 2024 20:12:02 -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 1tF1AQ-0002D2-Fh for guix-patches@gnu.org; Sat, 23 Nov 2024 20:12:02 -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:References:In-Reply-To:From:To:Subject; bh=9nb7bQhvuN2v2aVtJdehxXzKuQQ2FVaxM4y3cTUlRJA=; b=SDtZOXQ2L2ExxWL/Cbirb0j0yeXIfYd6/C6PaF6HnojxzvrJKikAiLfgcg9B8MhwfLaXx0r0dWi5cCzKbWntlZklP142NLovqfU+HZtwtSyMMNN9xWNy7efA7niKKhwMBp9kwwxgLIT/Wip03NYQHrB3TzHvJa/wQMo7cax+o1Vpd0vLGbXQSXtBVGbh0Coi5kK3kjP8vYKNhxE0DjtUR6AqDa2vF79dyjlEhrvE0/BpBq3s/oi2/wa3lo3XiItXryke1lBTQWl1J2vJ0rhR1Su3GJQUP0Z6tOz4JBrD5X2rtMtqFgpeqBw+4Fy4V5FbxNW72/CnzaDYfHciG4tYxA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF1AQ-0001QW-2f for guix-patches@gnu.org; Sat, 23 Nov 2024 20:12:02 -0500 Subject: bug#74380: [PATCH 1/2] gnu: Add llvm-19. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 01:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 74380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: dan Cc: 74380-done@debbugs.gnu.org Mail-Followup-To: 74380@debbugs.gnu.org, zhengjunjie@iscas.ac.cn, i@dan.games Received: via spool by 74380-done@debbugs.gnu.org id=D74380.17324106995446 (code D ref 74380); Sun, 24 Nov 2024 01:12:01 +0000 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 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-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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.74 X-Spam-Score: -4.74 X-Migadu-Queue-Id: BC75A8298E X-Migadu-Scanner: mx12.migadu.com X-TUID: wTYC9H0C2dlC --=-=-= 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----- --=-=-=--