GNU bug report logs - #78083
[PATCH 0/4] gcc 15

Previous Next

Package: guix-patches;

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

Date: Sun, 27 Apr 2025 09:13:02 UTC

Severity: normal

Tags: patch

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

To reply to this bug, email your comments to 78083 AT debbugs.gnu.org.
There is no need to reopen the bug first.

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

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


Report forwarded to andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org:
bug#78083; Package guix-patches. (Sun, 27 Apr 2025 09:13: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 andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org. (Sun, 27 Apr 2025 09:13: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 0/4] gcc 15
Date: Sun, 27 Apr 2025 17:11:51 +0800
Zheng Junjie (4):
  gnu: Add gcc-15.
  gnu: Add gcc-toolchain-15.
  gnu: Add gccgo-15.
  gnu: Add libgccjit-15.

 gnu/packages/commencement.scm |  3 ++
 gnu/packages/gcc.scm          | 52 ++++++++++++++++++++++++++++++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)


base-commit: 7ff20b9e94c429f1160bd8f0db86b153a03e4683
-- 
2.49.0





Information forwarded to andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org:
bug#78083; Package guix-patches. (Sun, 27 Apr 2025 09:18:02 GMT) Full text and rfc822 format available.

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

From: Zheng Junjie <z572 <at> z572.online>
To: 78083 <at> debbugs.gnu.org
Subject: [PATCH 1/4] gnu: Add gcc-15.
Date: Sun, 27 Apr 2025 17:16:53 +0800
* 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 <cmmarusich <at> gmail.com>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian <at> mgsn.dev>
 ;;; Copyright © 2022 Greg Hogan <code <at> greghogan.com>
-;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
+;;; Copyright © 2024, 2025 Zheng Junjie <z572 <at> z572.online>
 ;;; Copyright © 2023 Bruno Victal <mirai <at> makinata.eu>
 ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx <at> disroot.org>
@@ -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.
-- 
2.49.0





Information forwarded to andreas <at> enge.fr, efraim <at> flashner.co.il, ekaitz <at> elenq.tech, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org:
bug#78083; Package guix-patches. (Sun, 27 Apr 2025 09:18:02 GMT) Full text and rfc822 format available.

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

From: Zheng Junjie <z572 <at> z572.online>
To: 78083 <at> debbugs.gnu.org
Subject: [PATCH 2/4] gnu: Add gcc-toolchain-15.
Date: Sun, 27 Apr 2025 17:16:54 +0800
* gnu/packages/commencement.scm (gcc-toolchain-15): New variable.

Change-Id: I55e49e61626e8419ac936d1c5d241a586eaca47f
---
 gnu/packages/commencement.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 4368893f4da..60ade637e12 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3701,6 +3701,9 @@ (define-public gcc-toolchain-13
 (define-public gcc-toolchain-14
   (make-gcc-toolchain gcc-14))
 
+(define-public gcc-toolchain-15
+  (make-gcc-toolchain gcc-15))
+
 ;; The default GCC
 (define-public gcc-toolchain
   (if (host-hurd64?)
-- 
2.49.0





Information forwarded to andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org:
bug#78083; Package guix-patches. (Sun, 27 Apr 2025 09:18:03 GMT) Full text and rfc822 format available.

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

From: Zheng Junjie <z572 <at> z572.online>
To: 78083 <at> debbugs.gnu.org
Subject: [PATCH 3/4] gnu: Add gccgo-15.
Date: Sun, 27 Apr 2025 17:16:55 +0800
* gnu/packages/gcc.scm (gccgo-15): New variable.

Change-Id: Ie6c25492348d96c9c6ef549dfddb05481e07ff35
---
 gnu/packages/gcc.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 53da86aac00..16e9b03fe8d 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1399,6 +1399,10 @@ (define-public gccgo-13
 (define-public gccgo-14
   (make-gccgo gcc-14))
 
+;; Provides go-1.18
+(define-public gccgo-15
+  (make-gccgo gcc-15))
+
 (define (make-libstdc++-doc gcc)
   "Return a package with the libstdc++ documentation for GCC."
   (package
-- 
2.49.0





Information forwarded to andreas <at> enge.fr, janneke <at> gnu.org, ludo <at> gnu.org, z572 <at> z572.online, guix-patches <at> gnu.org:
bug#78083; Package guix-patches. (Sun, 27 Apr 2025 09:18:03 GMT) Full text and rfc822 format available.

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

From: Zheng Junjie <z572 <at> z572.online>
To: 78083 <at> debbugs.gnu.org
Subject: [PATCH 4/4] gnu: Add libgccjit-15.
Date: Sun, 27 Apr 2025 17:16:56 +0800
* gnu/packages/gcc.scm (libgccjit-15): New variable.

Change-Id: I09c381d6efbdc0d7e97a34b8a47ec860dc379e3d
---
 gnu/packages/gcc.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 16e9b03fe8d..24864488938 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1299,6 +1299,7 @@ (define-public libgccjit-10 (make-libgccjit gcc-10))
 (define-public libgccjit-11 (make-libgccjit gcc-11))
 (define-public libgccjit-12 (make-libgccjit gcc-12))
 (define-public libgccjit-14 (make-libgccjit gcc-14))
+(define-public libgccjit-15 (make-libgccjit gcc-15))
 
 ;; This must match the 'gcc' variable, but it must also be 'eq?' to one of the
 ;; libgccjit-* packages above.
-- 
2.49.0





Information forwarded to guix-patches <at> gnu.org:
bug#78083; Package guix-patches. (Sat, 03 May 2025 16:34:01 GMT) Full text and rfc822 format available.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zheng Junjie <z572 <at> z572.online>
Cc: Andreas Enge <andreas <at> enge.fr>, 78083 <at> debbugs.gnu.org,
 Janneke Nieuwenhuizen <janneke <at> gnu.org>
Subject: Re: [bug#78083] [PATCH 0/4] gcc 15
Date: Sat, 03 May 2025 18:26:55 +0200
Hi,

Zheng Junjie <z572 <at> z572.online> writes:

> Zheng Junjie (4):
>   gnu: Add gcc-15.
>   gnu: Add gcc-toolchain-15.
>   gnu: Add gccgo-15.
>   gnu: Add libgccjit-15.

This LGTM!  I would even make it a single commit maybe (which would
kindof serve as documentation of what it takes to add a new GCC
version.)

Thanks,
Ludo’.




Reply sent to Z572 <z572 <at> z572.online>:
You have taken responsibility. (Sat, 03 May 2025 17:25:02 GMT) Full text and rfc822 format available.

Notification sent to Zheng Junjie <z572 <at> z572.online>:
bug acknowledged by developer. (Sat, 03 May 2025 17:25:02 GMT) Full text and rfc822 format available.

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

From: Z572 <z572 <at> z572.online>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: Andreas Enge <andreas <at> enge.fr>, 78083-done <at> debbugs.gnu.org,
 Janneke Nieuwenhuizen <janneke <at> gnu.org>
Subject: Re: [bug#78083] [PATCH 0/4] gcc 15
Date: Sun, 04 May 2025 01:24:12 +0800
[Message part 1 (text/plain, inline)]
Ludovic Courtès <ludo <at> gnu.org> writes:

> Hi,
>
> Zheng Junjie <z572 <at> z572.online> writes:
>
>> Zheng Junjie (4):
>>   gnu: Add gcc-15.
>>   gnu: Add gcc-toolchain-15.
>>   gnu: Add gccgo-15.
>>   gnu: Add libgccjit-15.
>
> This LGTM!  I would even make it a single commit maybe (which would
> kindof serve as documentation of what it takes to add a new GCC
> version.)

thanks, adjust to single commit and pushed. closing.

>
> Thanks,
> Ludo’.
[signature.asc (application/pgp-signature, inline)]

This bug report was last modified 20 days ago.

Previous Next


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