diff options
author | Khem Raj <raj.khem@gmail.com> | 2025-03-27 09:32:37 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-28 11:19:40 +0000 |
commit | 1ed41d125bebdfe44928d6e86e222416c9ca89ff (patch) | |
tree | d9f8c3b5d510d5354ab5a51f2d5c1d5946143c15 | |
parent | 847f0f2346b8c0cd386a0283a9dbd5c844291729 (diff) | |
download | poky-1ed41d125bebdfe44928d6e86e222416c9ca89ff.tar.gz |
fmt: Backport patch to fix spdlog ABI issue
(From OE-Core rev: 47f5808d86c4721a16c8d7ae3d0d2b2bfe4d1247)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch | 35 | ||||
-rw-r--r-- | meta/recipes-devtools/fmt/fmt_11.1.4.bb | 3 |
2 files changed, 37 insertions, 1 deletions
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 0000000000..3fe85d51ee --- /dev/null +++ b/meta/recipes-devtools/fmt/fmt/0001-Workaround-an-ABI-issue-in-spdlog.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 5a5637c306c617ddb3726c76d3f7490a2dc0a5cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Victor Zverovich <viz@meta.com> | ||
3 | Date: Sat, 22 Mar 2025 06:57:04 -0700 | ||
4 | Subject: [PATCH] Workaround an ABI issue in spdlog | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/784eac839df77df1852dc1c50b17b76c3aec8f4a] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | include/fmt/format.h | 6 ++++-- | ||
10 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/include/fmt/format.h b/include/fmt/format.h | ||
13 | index 287e7163..61cb2825 100644 | ||
14 | --- a/include/fmt/format.h | ||
15 | +++ b/include/fmt/format.h | ||
16 | @@ -774,7 +774,9 @@ enum { inline_buffer_size = 500 }; | ||
17 | * converted to `std::string` with `to_string(out)`. | ||
18 | */ | ||
19 | template <typename T, size_t SIZE = inline_buffer_size, | ||
20 | - typename Allocator = detail::allocator<T>> | ||
21 | + // DEPRECATED! std::allocator should be replaced with | ||
22 | + // detail::allocator | ||
23 | + typename Allocator = std::allocator<T>> | ||
24 | class basic_memory_buffer : public detail::buffer<T> { | ||
25 | private: | ||
26 | T store_[SIZE]; | ||
27 | @@ -2594,7 +2596,7 @@ class bigint { | ||
28 | } | ||
29 | |||
30 | public: | ||
31 | - FMT_CONSTEXPR bigint() : exp_(0) {} | ||
32 | + FMT_CONSTEXPR20 bigint() : exp_(0) {} | ||
33 | explicit bigint(uint64_t n) { assign(n); } | ||
34 | |||
35 | 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 7c860eb608..1bcf758fd9 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" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https" | 7 | SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https \ |
8 | file://0001-Workaround-an-ABI-issue-in-spdlog.patch" | ||
8 | SRCREV = "123913715afeb8a437e6388b4473fcc4753e1c9a" | 9 | SRCREV = "123913715afeb8a437e6388b4473fcc4753e1c9a" |
9 | 10 | ||
10 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |