me
/
guix
Archived
1
0
Fork 0
Code

gnu: cross-gcc: Add patch for GCC 13. 

* gnu/local.mk (dist_patch_DATA): Add gcc-13-cross-system-header-dir.patch.
* gnu/packages/cross-base.scm (cross-gcc) <source>: Add patch for
GCC 13.
* gnu/packages/patches/gcc-13-cross-system-header-dir.patch: New patch.

Change-Id: Ib4771ff78222fb7b7df58891d25938d338bd5df8
Signed-off-by: Christopher Baines <mail@cbaines.net>
master
Jean-Pierre De Jesus DIAZ 2024-04-12 12:53:01 +02:00 committed by Christopher Baines
parent ffd1d0c2d4
commit 97bad5e194
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -1299,6 +1299,7 @@ dist_patch_DATA = \
%D%/packages/patches/gcc-12-cross-environment-variables.patch \
%D%/packages/patches/gcc-10-tree-sra-union-handling.patch \
%D%/packages/patches/gcc-11-libstdc++-powerpc.patch \
%D%/packages/patches/gcc-13-cross-system-header-dir.patch \
%D%/packages/patches/gcolor3-update-libportal-usage.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-brect-bounds.patch \

4
gnu/packages/cross-base.scm
View File

@ -321,6 +321,10 @@ target that libc."
(append
(origin-patches (package-source xgcc))
(append (cond
((version>=? (package-version xgcc) "13.0")
(search-patches "gcc-13-cross-system-header-dir.patch"
"gcc-12-cross-environment-variables.patch"
"gcc-cross-gxx-include-dir.patch"))
((version>=? (package-version xgcc) "12.0")
(search-patches "gcc-12-cross-environment-variables.patch"
"gcc-cross-gxx-include-dir.patch"))

32
gnu/packages/patches/gcc-13-cross-system-header-dir.patch 100644
View File

@ -0,0 +1,32 @@
From 8b001f38cc713190642194b55e02a56346f51494 Mon Sep 17 00:00:00 2001
From: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
Date: Fri, 12 Apr 2024 12:18:24 +0200
Subject: [PATCH] Fix CROSS_SYSTEM_HEADER_DIR value for Guix.
* gcc/Makefile.in (CROSS_SYSTEM_HEADER_DIR): Always use default value.
---
gcc/Makefile.in | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 775aaa1b3c4..06d192fa9ed 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -532,11 +532,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h
# Default native SYSTEM_HEADER_DIR, to be overridden by targets.
NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@
# Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
-ifeq (@includedir@,$(prefix)/include)
- CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
-else
- CROSS_SYSTEM_HEADER_DIR = @includedir@
-endif
+CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
# autoconf sets SYSTEM_HEADER_DIR to one of the above.
# Purge it of unnecessary internal relative paths
base-commit: c891d8dc23e1a46ad9f3e757d09e57b500d40044
--
2.41.0