mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

mtd-utils: Fix GCC version detection

Browse Source 
Helps building with GCC with 0 in minor version e.g. 15.0.1

(From OE-Core rev: ed24490dccf348ba55816d45a2444d4bf0f574c8)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2025-03-24 09:33:33 -07:00
committed by Richard Purdie
parent a6b876bc48
commit d7b46cb079
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/mtd/files/0001-Improve-check-for-GCC-compiler-version.patch
+34
View File
@@ -0,0 +1,34 @@
From e7adb21350ff3b96dbd2de56a127e9d916c08d62 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 22 Mar 2025 19:05:32 -0700
Subject: [PATCH] Improve check for GCC compiler version
When using unreleased compiler has version like
15.0.1 and that test fails because __GNUC_MINOR__ < 1
becomes true, therefore check for full version string
which is more rubust.
Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-mtd/2025-March/108860.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
ubifs-utils/common/atomic.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ubifs-utils/common/atomic.h b/ubifs-utils/common/atomic.h
index f287d43..95754b2 100644
--- a/ubifs-utils/common/atomic.h
+++ b/ubifs-utils/common/atomic.h
@@ -2,8 +2,12 @@
#ifndef __ATOMIC_H__
#define __ATOMIC_H__
+#define GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100 \
+ + __GNUC_PATCHLEVEL__)
+
/* Check GCC version, just to be safe */
-#if !defined(__GNUC__) || (__GNUC__ < 4) || (__GNUC_MINOR__ < 1)
+#if GCC_VERSION < 40100
# error atomic.h works only with GCC newer than version 4.1
#endif /* GNUC >= 4.1 */
meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb
+2 -1
View File
@@ -16,7 +16,8 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch \ file://0001-ubifs-utils-ubifs.h-Include-fcntl.h.patch \
file://0002-ubifs-utils-journal-Include-sys-stat.h.patch \ file://0002-ubifs-utils-journal-Include-sys-stat.h.patch \
file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch \ file://0003-ubifs-utils-link-libmissing.a-in-case-execinfo.h-isn.patch \
file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch" file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch \
file://0001-Improve-check-for-GCC-compiler-version.patch"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"