From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 27 Mar 2025 16:32:37 +0000 (-0700)
Subject: fmt: Backport patch to fix spdlog ABI issue
X-Git-Tag: yocto-5.2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47f5808d86c4721a16c8d7ae3d0d2b2bfe4d1247;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

fmt: Backport patch to fix spdlog ABI issue

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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
new file mode 100644
index 00000000000..3fe85d51ee4
--- /dev/null
+++ b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch
@@ -0,0 +1,35 @@
+From 5a5637c306c617ddb3726c76d3f7490a2dc0a5cd Mon Sep 17 00:00:00 2001
+From: Victor Zverovich <viz@meta.com>
+Date: Sat, 22 Mar 2025 06:57:04 -0700
+Subject: [PATCH] Workaround an ABI issue in spdlog
+
+Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/784eac839df77df1852dc1c50b17b76c3aec8f4a]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/fmt/format.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/include/fmt/format.h b/include/fmt/format.h
+index 287e7163..61cb2825 100644
+--- a/include/fmt/format.h
++++ b/include/fmt/format.h
+@@ -774,7 +774,9 @@ enum { inline_buffer_size = 500 };
+  * converted to `std::string` with `to_string(out)`.
+  */
+ template <typename T, size_t SIZE = inline_buffer_size,
+-          typename Allocator = detail::allocator<T>>
++          // DEPRECATED! std::allocator should be replaced with
++          // detail::allocator
++          typename Allocator = std::allocator<T>>
+ class basic_memory_buffer : public detail::buffer<T> {
+  private:
+   T store_[SIZE];
+@@ -2594,7 +2596,7 @@ class bigint {
+   }
+ 
+  public:
+-  FMT_CONSTEXPR bigint() : exp_(0) {}
++  FMT_CONSTEXPR20 bigint() : exp_(0) {}
+   explicit bigint(uint64_t n) { assign(n); }
+ 
+   bigint(const bigint&) = delete;
diff --git a/meta/recipes-devtools/fmt/fmt_11.1.4.bb b/meta/recipes-devtools/fmt/fmt_11.1.4.bb
index 7c860eb6087..1bcf758fd9a 100644
--- a/meta/recipes-devtools/fmt/fmt_11.1.4.bb
+++ b/meta/recipes-devtools/fmt/fmt_11.1.4.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "https://fmt.dev"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
 
-SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https"
+SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https \
+           file://0001-Workaround-an-ABI-issue-in-spdlog.patch"
 SRCREV = "123913715afeb8a437e6388b4473fcc4753e1c9a"
 
 S = "${WORKDIR}/git"