mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-11-08 10:09:16 +00:00
Bump fmt to version 8.1.1 on macOS
This allows to bump the minimum required fmt version. Fixes: #6984 Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
2 files changed
+2
-17
No files matched your search
@@ -47,7 +47,7 @@ ICU_VERSION="icu4c-69_1"
|
|||||||
ENET_VERSION="enet-1.3.18"
|
ENET_VERSION="enet-1.3.18"
|
||||||
MINIUPNPC_VERSION="miniupnpc-2.2.8"
|
MINIUPNPC_VERSION="miniupnpc-2.2.8"
|
||||||
SODIUM_VERSION="libsodium-1.0.20"
|
SODIUM_VERSION="libsodium-1.0.20"
|
||||||
FMT_VERSION="7.1.3"
|
FMT_VERSION="8.1.1"
|
||||||
MOLTENVK_VERSION="1.3.0"
|
MOLTENVK_VERSION="1.3.0"
|
||||||
OPENAL_SOFT_VERSION="1.24.2"
|
OPENAL_SOFT_VERSION="1.24.2"
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
@@ -1160,11 +1160,9 @@ echo "Building fmt..."
|
|||||||
rm -f .already-built
|
rm -f .already-built
|
||||||
download_lib $LIB_URL $LIB_ARCHIVE || die
|
download_lib $LIB_URL $LIB_ARCHIVE || die
|
||||||
|
|
||||||
rm -rf $LIB_DIRECTORY include lib
|
rm -rf $LIB_DIRECTORY include lib libfmt
|
||||||
tar -xf $LIB_ARCHIVE || die
|
tar -xf $LIB_ARCHIVE || die
|
||||||
|
|
||||||
# It appears that older versions of Clang require constexpr statements to have a user-set constructor.
|
|
||||||
patch -Np1 -d $LIB_DIRECTORY -i ../../../macos-patches/fmt_constexpr.diff || die
|
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
cmake -B libfmt \
|
cmake -B libfmt \
|
||||||
-S $LIB_DIRECTORY \
|
-S $LIB_DIRECTORY \
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
diff --git a/include/fmt/os.h b/include/fmt/os.h
|
|
||||||
index 88151006..11c3b2cc 100644
|
|
||||||
--- a/include/fmt/os.h
|
|
||||||
+++ b/include/fmt/os.h
|
|
||||||
@@ -375,7 +375,7 @@ struct ostream_params {
|
|
||||||
};
|
|
||||||
} // namespace detail
|
|
||||||
|
|
||||||
-static constexpr detail::buffer_size buffer_size;
|
|
||||||
+static constexpr detail::buffer_size buffer_size{};
|
|
||||||
|
|
||||||
// A fast output stream which is not thread-safe.
|
|
||||||
class ostream final : private detail::buffer<char> {
|
|
||||||
Reference in new issue
Block a user