diff --git a/libraries/build-macos-libs.sh b/libraries/build-macos-libs.sh index bda490c6f8..4a4cdfcbd5 100755 --- a/libraries/build-macos-libs.sh +++ b/libraries/build-macos-libs.sh @@ -47,7 +47,7 @@ ICU_VERSION="icu4c-69_1" ENET_VERSION="enet-1.3.18" MINIUPNPC_VERSION="miniupnpc-2.2.8" SODIUM_VERSION="libsodium-1.0.20" -FMT_VERSION="7.1.3" +FMT_VERSION="8.1.1" MOLTENVK_VERSION="1.3.0" OPENAL_SOFT_VERSION="1.24.2" # -------------------------------------------------------------- @@ -1160,11 +1160,9 @@ echo "Building fmt..." rm -f .already-built 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 - # 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 cmake -B libfmt \ -S $LIB_DIRECTORY \ diff --git a/libraries/macos-patches/fmt_constexpr.diff b/libraries/macos-patches/fmt_constexpr.diff deleted file mode 100644 index 3adcd84474..0000000000 --- a/libraries/macos-patches/fmt_constexpr.diff +++ /dev/null @@ -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 {