guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/20: gnu: cross-gcc-patches: Avoid patch for GCC 13+.


From: guix-commits
Subject: 07/20: gnu: cross-gcc-patches: Avoid patch for GCC 13+.
Date: Mon, 15 Apr 2024 05:18:39 -0400 (EDT)

cbaines pushed a commit to branch master
in repository guix.

commit ffd1d0c2d486b9de35706ca73a4e89177114e4de
Author: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
AuthorDate: Fri Apr 12 12:53:00 2024 +0200

    gnu: cross-gcc-patches: Avoid patch for GCC 13+.
    
    * gnu/packages/cross-base.scm (cross-gcc-patches): Avoid
    gcc-4.9.3-mingw-gthr-default.patch patch for GCC 13+ versions since it
    does not apply.
    
    Change-Id: I4bb14d687c53733d77099a761844815900b1266a
    Signed-off-by: Christopher Baines <mail@cbaines.net>
---
 gnu/packages/cross-base.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 2d79e0acf6..e62402a09e 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -250,7 +250,9 @@ base compiler and using LIBC (which may be either a libc 
package or #f.)"
          ;; Patch by Qualcomm needed to build the ath9k-htc firmware.
          (search-patches "ath9k-htc-firmware-gcc.patch"))
         ((target-mingw? target)
-         (append (search-patches "gcc-4.9.3-mingw-gthr-default.patch")
+         (append (if (not (version>=? (package-version xgcc) "13.0"))
+                     (search-patches "gcc-4.9.3-mingw-gthr-default.patch")
+                     '())
                  (if (version>=? (package-version xgcc) "7.0")
                      (search-patches "gcc-7-cross-mingw.patch")
                      '())))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]