6ad9daf99a
See announcement mail for list of new features: https://lists.infradead.org/pipermail/linux-mtd/2025-February/108248.html Cherry pick some upstream commits which fix build problems in some situations. autoreconf fixup is needed now otherwise the build fails with: ``` mtd-utils-2.3.0/missing: line 81: automake-1.16: command not found ``` The code in tests/ubifs_tools-tests/Makemodule.am does not build because some test data is not packaged in the tar files, do not build code from this directory. The size increased only very little: 61498 bin/targets/ramips/mt7621/packages/nand-utils-2.3.0-r1.apk 101643 bin/targets/ramips/mt7621/packages/ubi-utils-2.3.0-r1.apk 61243 bin/targets/ramips/mt7621/packages/nand-utils-2.2.1-r1.apk 101291 bin/targets/ramips/mt7621/packages/ubi-utils-2.2.1-r1.apk Link: https://github.com/openwrt/openwrt/pull/20540 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
From ac0ab65ebcd7b11739986b81343457469fbb43b0 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Sat, 22 Mar 2025 21:01:32 -0700
|
|
Subject: 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.
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
|
|
---
|
|
ubifs-utils/common/atomic.h | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
--- 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 */
|
|
|