From patchwork Sun Apr 27 09:16:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 42044 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 C7AEE27BC4B; Sun, 27 Apr 2025 10:18:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,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 47E7027BC49 for ; Sun, 27 Apr 2025 10:18:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8y9M-0005R8-Io; Sun, 27 Apr 2025 05:18:13 -0400 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 1u8y9H-0005QP-3I for guix-patches@gnu.org; Sun, 27 Apr 2025 05:18:09 -0400 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 1u8y9E-0003rE-RD; Sun, 27 Apr 2025 05:18:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=BtkK2OzCLHr5JUbK7TiLN4nnKF80k/Xhw6SY4ah0LUQ=; b=AHZC3k5xkQDHUzVq28+Hm1SrhYjszCmSd4S8fA5XoYMTVuZUk+N2yQ8XDUFrLj4jg9biW4MOoREMwvKX2WjHH0HC4QPZPyt8LjLn3vGSRtIpmc9a9Q3gTxet9wji8aNbXobOPZ9szQeA1m9J3dHqcE/eL48q4CjFZaUH/cBxmg+TyumotEb4sZ/ULcxj4NEFb+zLcKuMBEyhBB+h4cwX3YSv8x++MIwJdy9jOckBcOrCQJ4sFbNG7GLXIEQJmYgSBHgcB1tAedEZLe7eD4mV5fenr0yZt6nu0gj8y3J+mQf4WHyWWHP01yhdql34Ros1vlf6ATMkc/MREuA6CoJIZA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8y9C-0002sW-7P; Sun, 27 Apr 2025 05:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78083] [PATCH 1/4] gnu: Add gcc-15. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, janneke@gnu.org, ludo@gnu.org, z572@z572.online, guix-patches@gnu.org Resent-Date: Sun, 27 Apr 2025 09:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78083 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78083@debbugs.gnu.org Cc: Andreas Enge , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Zheng Junjie X-Debbugs-Original-Xcc: Andreas Enge , Janneke Nieuwenhuizen , Ludovic =?utf-8?q?Court=C3=A8s?= , Zheng Junjie Received: via spool by 78083-submit@debbugs.gnu.org id=B78083.174574543510753 (code B ref 78083); Sun, 27 Apr 2025 09:18:02 +0000 Received: (at 78083) by debbugs.gnu.org; 27 Apr 2025 09:17:15 +0000 Received: from localhost ([127.0.0.1]:39038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8y8O-0002ml-EG for submit@debbugs.gnu.org; Sun, 27 Apr 2025 05:17:14 -0400 Received: from mail.z572.online ([88.99.160.180]:46694) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8y8K-0002m1-8n for 78083@debbugs.gnu.org; Sun, 27 Apr 2025 05:17:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1745745827; 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: in-reply-to:in-reply-to:references:references; bh=BtkK2OzCLHr5JUbK7TiLN4nnKF80k/Xhw6SY4ah0LUQ=; b=h4IcJJoLSiBQsmEPFds0QSdiybGFBYK8x+iSO6ElMCGXlkhw+OjugrcIgviE+hnwL3kFNR BaxxQLtZ5bltbuOcrzXF+Gn5mzjvlZXTfPyKj7KDuBnpzIBz/BwmihGVzW0JNFeLk7VxHw wowx3eahVbACPpFhVzj6ZzrNzTQLvaE= Received: from m.tailaa68d.ts.net (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 23fa0c9c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <78083@debbugs.gnu.org>; Sun, 27 Apr 2025 09:23:46 +0000 (UTC) From: Zheng Junjie Date: Sun, 27 Apr 2025 17:16:53 +0800 Message-ID: <81517d29a691f3306abc17b1cfb212d0e23d8f0d.1745660337.git.z572@z572.online> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 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/gcc.scm (gcc-15): New variable. Change-Id: I55e49e61626e8419ac936d1c5d241a586eaca47f --- gnu/packages/gcc.scm | 47 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 36783af37da..53da86aac00 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Greg Hogan -;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024, 2025 Zheng Junjie ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 Maxim Cournoyer ;;; Copyright © 2024 Nguyễn Gia Phong @@ -856,6 +856,51 @@ (define-public gcc-14 ("x86_64" ,@%gcc-14-x86_64-micro-architectures)) ,@(package-properties gcc-11))))) +(define-public gcc-15 + (package + (inherit gcc-14) + (version "15.1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gcc/gcc-" + version "/gcc-" version ".tar.xz")) + (sha256 + (base32 + "1skcy1a3wwb8k25f9l1qy11nj8b5089f05dpzzn1zw302v19xc72")) + (patches (search-patches "gcc-12-strmov-store-file-names.patch" + "gcc-5.0-libvtv-runpath.patch")) + (modules '((guix build utils))) + (snippet gcc-canadian-cross-objdump-snippet))) + (arguments + (substitute-keyword-arguments (package-arguments gcc-14) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'install 'adjust-modules-file + ;; Avoid cycle dependencies + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (assoc-ref outputs "lib")) + (out (assoc-ref outputs "out"))) + (when lib + (let ((modfile (string-append + lib "/lib/libstdc++.modules.json")) + (origin (string-append out "/include/c++/bits")) + (modpath (string-append lib "/include/c++/bits"))) + + (for-each (lambda (file) (install-file file modpath)) + (find-files origin "\\.cc$")) + (substitute* modfile + ;; Relative path to out output + (("\\.\\./\\.\\./.*/include") + (string-append lib "/include")))))))))))) + (properties + `((compiler-cpu-architectures + ("aarch64" ,@%gcc-13-aarch64-micro-architectures) + ("armhf" ,@%gcc-13-armhf-micro-architectures) + ("i686" ,@%gcc-13-x86_64-micro-architectures) + ("powerpc64le" ,@%gcc-10-ppc64le-micro-architectures) + ("x86_64" ,@%gcc-14-x86_64-micro-architectures)) + ,@(package-properties gcc-11))))) + ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions.