summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2025-02-18 15:39:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-02-18 22:53:44 +0000
commit271d2c064e9c9597767d3f146cd27efbcf21f51a (patch)
tree1f9a03379d4e67de16b9b443a07916a345d72d6d
parentd3e69d01d9a2b9e87a6ced676f3cc38b0b104c46 (diff)
downloadpoky-271d2c064e9c9597767d3f146cd27efbcf21f51a.tar.gz
fmt: upgrade 11.1.1 -> 11.1.3
fix-gcc9.patch removed since it's included in 11.1.3 Changelog: ========= - Fixed compilation on GCC 9.4 - Worked around an internal compiler error when using C++20 modules with GCC 14.2 and earlier - Worked around a bug in GCC 6 - Fixed an issue caused by instantiating 'formatter<const T>' - Fixed formatting into 'std::ostreambuf_iterator' when using format string compilation - Restored a constraint on the map formatter so that it correctly reports as unformattable when the element is - Reduced the size of format specs - Readded 'args()' to 'fmt::format_context' - Fixed a bogus MSVC warning - Fixed a pedantic mode error in the CMake config - Fixed ABI compatibility with earlier 11.x versions - Added 'wchar_t' support to the 'std::bitset' formatter - Prefixed CMake components with 'fmt-' to simplify usage of {fmt} via 'add_subdirectory' - Updated docs for meson - Fixed a compilation error in chrono on nvcc - Fixed various warnings (From OE-Core rev: cfe2d61fa142ae146abdb44a3de028b9804ddc91) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/fmt/files/fix-gcc9.patch26
-rw-r--r--meta/recipes-devtools/fmt/fmt_11.1.3.bb (renamed from meta/recipes-devtools/fmt/fmt_11.1.1.bb)5
2 files changed, 2 insertions, 29 deletions
diff --git a/meta/recipes-devtools/fmt/files/fix-gcc9.patch b/meta/recipes-devtools/fmt/files/fix-gcc9.patch
deleted file mode 100644
index 1d67f7094d..0000000000
--- a/meta/recipes-devtools/fmt/files/fix-gcc9.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 5f0572acdca120e11f6d810765d7a6a3c593fcbb Mon Sep 17 00:00:00 2001
2From: Victor Zverovich <viz@meta.com>
3Date: Sat, 18 Jan 2025 09:00:22 -0800
4Subject: [PATCH] Workaround a compilation error on gcc 9.4
5
6Upstream-Status: Backport [5f0572acdca120e11f6d810765d7a6a3c593fcbb]
7Signed-off-by: Ross Burton <ross.burton@arm.com>
8---
9 include/fmt/format.h | 4 +++-
10 1 file changed, 3 insertions(+), 1 deletion(-)
11
12diff --git a/include/fmt/format.h b/include/fmt/format.h
13index 9cd523a9e6a5..4466b4f4d24b 100644
14--- a/include/fmt/format.h
15+++ b/include/fmt/format.h
16@@ -227,7 +227,9 @@ FMT_CONSTEXPR inline void abort_fuzzing_if(bool condition) {
17 #if defined(FMT_USE_STRING_VIEW)
18 template <typename Char> using std_string_view = std::basic_string_view<Char>;
19 #else
20-template <typename T> struct std_string_view {};
21+template <typename Char> struct std_string_view {
22+ operator basic_string_view<Char>() const;
23+};
24 #endif
25
26 template <typename Char, Char... C> struct string_literal {
diff --git a/meta/recipes-devtools/fmt/fmt_11.1.1.bb b/meta/recipes-devtools/fmt/fmt_11.1.3.bb
index cfacd81a11..9a2ee396dd 100644
--- a/meta/recipes-devtools/fmt/fmt_11.1.1.bb
+++ b/meta/recipes-devtools/fmt/fmt_11.1.3.bb
@@ -4,9 +4,8 @@ HOMEPAGE = "https://fmt.dev"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
6 6
7SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https \ 7SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https"
8 file://fix-gcc9.patch" 8SRCREV = "9cf9f38eded63e5e0fb95cd536ba51be601d7fa2"
9SRCREV = "e3ddede6c4ee818825c4e5a6dfa1d384860c27d9"
10 9
11S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
12 11