zepto-mirrors/meta-zephyr
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-zephyr synced 2026-01-29 21:58:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

zephyr-kernel-src-3.3.0: fix build with gcc-13

Browse Source 
Configuration error:
| -- Configuring done (4.9s)
| CMake Error in CMakeLists.txt:
|   Target "zephyr_interface" contains relative path in its
|   INTERFACE_INCLUDE_DIRECTORIES:
|
|     "include-fixed"

With GCC-13, limits.h and syslimits.h header files
are always being installed to include folder.
https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=be9dd80f933480

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
This commit is contained in:
Naveen Saini
2023-05-30 13:35:19 +08:00
parent 953fbe1238
commit 00ae4c13c0
2 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
meta-zephyr-core/recipes-kernel/zephyr-kernel/files/0001-gcc-target.cmake-fix-build-with-gcc-13.patch Normal file
View File

@@ -0,0 +1,54 @@
From ba1ca46190900b5d003e3d0386c20694f04b1710 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Mon, 29 May 2023 17:48:20 +0800
Subject: [PATCH] gcc/target.cmake: fix build with gcc-13
Configuration error:
| -- Configuring done (4.9s)
| CMake Error in CMakeLists.txt:
| Target "zephyr_interface" contains relative path in its
| INTERFACE_INCLUDE_DIRECTORIES:
|
| "include-fixed"
With GCC-13, limits.h and syslimits.h header files
are always being installed to include folder.
https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=be9dd80f933480
Upstream-Status: Submitted [https://github.com/zephyrproject-rtos/zephyr/pull/58408]
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
cmake/compiler/gcc/target.cmake | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/cmake/compiler/gcc/target.cmake b/cmake/compiler/gcc/target.cmake
index c970048297..e78a7c6a0b 100644
--- a/cmake/compiler/gcc/target.cmake
+++ b/cmake/compiler/gcc/target.cmake
@@ -34,7 +34,21 @@ if(NOT DEFINED NOSYSDEF_CFLAG)
set(NOSYSDEF_CFLAG -undef)
endif()
-foreach(file_name include/stddef.h include-fixed/limits.h)
+# GCC-13, does not install limits.h on include-fixed anymore
+# https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=be9dd80f933480
+# Add check for GCC version >= 13.1
+execute_process(
+ COMMAND ${CMAKE_C_COMPILER} -dumpversion
+ OUTPUT_VARIABLE TEMP_COMPILER_VERSION
+ )
+
+if(${TEMP_COMPILER_VERSION} VERSION_GREATER_EQUAL 13.1.0)
+ set(FIX_HEADER_FILE include/limits.h)
+else()
+ set(FIX_HEADER_FILE include-fixed/limits.h)
+endif()
+
+foreach(file_name include/stddef.h ${FIX_HEADER_FILE})
execute_process(
COMMAND ${CMAKE_C_COMPILER} --print-file-name=${file_name}
OUTPUT_VARIABLE _OUTPUT
--
2.34.1

1
meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src-3.3.0.inc
View File

@@ -117,6 +117,7 @@ SRC_URI_ZEPHYR_THRIFT ?= "git://github.com/zephyrproject-rtos/thrift;protocol=ht
SRC_URI_PATCHES ?= "\
file://0001-3.3-x86-fix-efi-binary-generation-issue-in-cross-compila.patch;patchdir=zephyr \
file://0002-3.3-toolchain-gcc-Fix-separator-between-directives-on-sa.patch;patchdir=zephyr \
file://0001-gcc-target.cmake-fix-build-with-gcc-13.patch;patchdir=zephyr \
"
SRC_URI = "\