mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fmt: Fix build with clang-21

Browse Source 
Backport a fix from upstream master branch

(From OE-Core rev: 9cc8092b287b8df957c5ae6503f4ef35edba5871)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2025-07-31 21:22:41 -07:00
committed by Richard Purdie
parent 02b3910444
commit bcdcc5e169
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
meta/recipes-devtools/fmt/fmt/0001-Fix-compilation-on-clang-21-libc-21-4477.patch Normal file
View File

@@ -0,0 +1,46 @@
From f4345467fce7edbc6b36c3fa1cf197a67be617e2 Mon Sep 17 00:00:00 2001
From: Remy Jette <remy@remyjette.com>
Date: Sat, 21 Jun 2025 07:28:14 -0700
Subject: [PATCH] Fix compilation on clang-21 / libc++-21 (#4477)
`<cstdlib>` was not being included, so malloc and free were only declared
via transitive includes. Some includes changed in the latest libc++-21
build which broke fmt.
Also changed `malloc`/`free` to `std::malloc` and `std::free`, as
putting those symbols in the global namespace is optional for the
implementation when including `<cstdlib>`.
Upstream-Status: Backport [https://github.com/fmtlib/fmt/pull/4477]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/fmt/format.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: fmt-11.2.0/include/fmt/format.h
===================================================================
--- fmt-11.2.0.orig/include/fmt/format.h
+++ fmt-11.2.0/include/fmt/format.h
@@ -44,6 +44,7 @@
# include <cmath> // std::signbit
# include <cstddef> // std::byte
# include <cstdint> // uint32_t
+# include <cstdlib> // std::malloc, std::free
# include <cstring> // std::memcpy
# include <limits> // std::numeric_limits
# include <new> // std::bad_alloc
@@ -744,12 +745,12 @@ template <typename T> struct allocator {
T* allocate(size_t n) {
FMT_ASSERT(n <= max_value<size_t>() / sizeof(T), "");
- T* p = static_cast<T*>(malloc(n * sizeof(T)));
+ T* p = static_cast<T*>(std::malloc(n * sizeof(T)));
if (!p) FMT_THROW(std::bad_alloc());
return p;
}
- void deallocate(T* p, size_t) { free(p); }
+ void deallocate(T* p, size_t) { std::free(p); }
};
} // namespace detail

4
meta/recipes-devtools/fmt/fmt_11.2.0.bb
View File

@@ -5,7 +5,9 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https;tag=${PV}\
file://0001-Workaround-an-ABI-issue-in-spdlog.patch"
file://0001-Workaround-an-ABI-issue-in-spdlog.patch \
file://0001-Fix-compilation-on-clang-21-libc-21-4477.patch \
"
SRCREV = "40626af88bd7df9a5fb80be7b25ac85b122d6c21"
inherit cmake