From: Robert Yang <[email protected]> * Remove backport patch 0001-Fix-compilation-on-cl * Refresh 0001-Workaround-an-ABI-issue-in-spdlog.patch
Signed-off-by: Robert Yang <[email protected]> --- ...compilation-on-clang-21-libc-21-4477.patch | 46 ------------------- ...01-Workaround-an-ABI-issue-in-spdlog.patch | 8 ++-- .../fmt/{fmt_11.2.0.bb => fmt_12.1.0.bb} | 5 +- 3 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-devtools/fmt/fmt/0001-Fix-compilation-on-clang-21-libc-21-4477.patch rename meta/recipes-devtools/fmt/{fmt_11.2.0.bb => fmt_12.1.0.bb} (84%) diff --git a/meta/recipes-devtools/fmt/fmt/0001-Fix-compilation-on-clang-21-libc-21-4477.patch b/meta/recipes-devtools/fmt/fmt/0001-Fix-compilation-on-clang-21-libc-21-4477.patch deleted file mode 100644 index 911fa90a40..0000000000 --- a/meta/recipes-devtools/fmt/fmt/0001-Fix-compilation-on-clang-21-libc-21-4477.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f4345467fce7edbc6b36c3fa1cf197a67be617e2 Mon Sep 17 00:00:00 2001 -From: Remy Jette <[email protected]> -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 <[email protected]> ---- - 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 diff --git a/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch index 3fe85d51ee..442506f834 100644 --- a/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch +++ b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch @@ -1,4 +1,4 @@ -From 5a5637c306c617ddb3726c76d3f7490a2dc0a5cd Mon Sep 17 00:00:00 2001 +From 32f4a4a634c99d4e00cc6149786a9180ad651f76 Mon Sep 17 00:00:00 2001 From: Victor Zverovich <[email protected]> Date: Sat, 22 Mar 2025 06:57:04 -0700 Subject: [PATCH] Workaround an ABI issue in spdlog @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/fmt/format.h b/include/fmt/format.h -index 287e7163..61cb2825 100644 +index 4a653007..82f80efd 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h -@@ -774,7 +774,9 @@ enum { inline_buffer_size = 500 }; +@@ -793,7 +793,9 @@ enum { inline_buffer_size = 500 }; * converted to `std::string` with `to_string(out)`. */ template <typename T, size_t SIZE = inline_buffer_size, @@ -24,7 +24,7 @@ index 287e7163..61cb2825 100644 class basic_memory_buffer : public detail::buffer<T> { private: T store_[SIZE]; -@@ -2594,7 +2596,7 @@ class bigint { +@@ -2746,7 +2748,7 @@ class bigint { } public: diff --git a/meta/recipes-devtools/fmt/fmt_11.2.0.bb b/meta/recipes-devtools/fmt/fmt_12.1.0.bb similarity index 84% rename from meta/recipes-devtools/fmt/fmt_11.2.0.bb rename to meta/recipes-devtools/fmt/fmt_12.1.0.bb index 133e1ae77d..22cab6f138 100644 --- a/meta/recipes-devtools/fmt/fmt_11.2.0.bb +++ b/meta/recipes-devtools/fmt/fmt_12.1.0.bb @@ -4,12 +4,11 @@ HOMEPAGE = "https://fmt.dev"; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" -SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https;tag=${PV}\ +SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https;tag=${PV} \ file://0001-Workaround-an-ABI-issue-in-spdlog.patch \ - file://0001-Fix-compilation-on-clang-21-libc-21-4477.patch \ file://run-ptest \ " -SRCREV = "40626af88bd7df9a5fb80be7b25ac85b122d6c21" +SRCREV = "407c905e45ad75fc29bf0f9bb7c5c2fd3475976f" inherit cmake ptest -- 2.49.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#226482): https://lists.openembedded.org/g/openembedded-core/message/226482 Mute This Topic: https://lists.openembedded.org/mt/116333884/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
