From 32b4e9807954d6eb06d407a2b02df2bf1cf4c7cd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Mar 2025 11:38:03 -0700 Subject: flashrom: Fix build with clang Signed-off-by: Khem Raj --- .../0001-linux_mtd-fix-build-with-clang-19.patch | 39 ++++++++++++++++++++++ meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch new file mode 100644 index 0000000000..46bd0bba44 --- /dev/null +++ b/meta-oe/recipes-bsp/flashrom/flashrom/0001-linux_mtd-fix-build-with-clang-19.patch @@ -0,0 +1,39 @@ +From 615fae91dafdb89f0f8418129918dbb7ff879cf6 Mon Sep 17 00:00:00 2001 +From: Arnaud Ferraris +Date: Thu, 24 Oct 2024 17:51:29 +0200 +Subject: [PATCH] linux_mtd: fix build with clang >= 19 + +Starting with version 19, clang issues a warning when using `strlen()` +for initializing a static array's size. This causes the build to fail as +the project also sets `-Werror`. + +This is fixed by using `sizeof()` instead, which is guaranteed to be +evaluated at compilation time and therefore not triggering the +problematic warning. + +Upstream-Status: Backport [https://github.com/flashrom/flashrom/commit/34b1a6aa57e910c0b5a518e8a0cab6841c7efaee] + +Change-Id: If470a65702e9ae08e4303123a0014e53a1fee56e +Signed-off-by: Arnaud Ferraris +Reviewed-on: https://review.coreboot.org/c/flashrom/+/84856 +Tested-by: build bot (Jenkins) +Reviewed-by: Maximilian Brune +Reviewed-by: Anastasia Klimchuk +Signed-off-by: Khem Raj +--- + linux_mtd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux_mtd.c b/linux_mtd.c +index eea0cf2..0cb2330 100644 +--- a/linux_mtd.c ++++ b/linux_mtd.c +@@ -49,7 +49,7 @@ static int read_sysfs_string(const char *sysfs_path, const char *filename, char + int i; + size_t bytes_read; + FILE *fp; +- char path[strlen(LINUX_MTD_SYSFS_ROOT) + 32]; ++ char path[sizeof(LINUX_MTD_SYSFS_ROOT) + 31]; + + snprintf(path, sizeof(path), "%s/%s", sysfs_path, filename); + diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb index 98447809cf..6c5d05f2d0 100644 --- a/meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb +++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.4.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.xz \ file://0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch \ file://0002-meson-Add-options-pciutils-ftdi-usb.patch \ + file://0001-linux_mtd-fix-build-with-clang-19.patch \ " SRC_URI[sha256sum] = "eb0eb3e61a57fd1926c66f08664cf04a96f92cee23b600cf563087c2178d70d8" -- cgit v1.2.3-54-g00ecf