From bb94f5a4ffb7e27ea5b57b323148c3ab286c4a26 Mon Sep 17 00:00:00 2001 From: Azi Hassan Date: Mon, 7 Oct 2024 02:48:46 +0100 Subject: [PATCH] Remove obsolete libfmt patching shenanigans --- .github/workflows/dreamcast.yml | 2 -- Dockerfile | 3 --- libfmt-long-double.patch | 12 ------------ 3 files changed, 17 deletions(-) delete mode 100644 libfmt-long-double.patch diff --git a/.github/workflows/dreamcast.yml b/.github/workflows/dreamcast.yml index 93a42ebcfb8..e51c38cc754 100644 --- a/.github/workflows/dreamcast.yml +++ b/.github/workflows/dreamcast.yml @@ -68,8 +68,6 @@ jobs: - name: Build DevilutionX run: | - # patches libfmt to support long double - patch build/_deps/libfmt-src/include/fmt/format.h -l -p0 < libfmt-long-double.patch source /opt/toolchains/dc/kos/environ.sh && cd build && kos-make - name: Generate .cdi diff --git a/Dockerfile b/Dockerfile index fb82fc9de58..b33cd77d5ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,9 +31,6 @@ RUN source /opt/toolchains/dc/kos/environ.sh && \ export CMAKE_PREFIX_PATH=/opt/toolchains/dc/kos-ports/libbz2/inst/:/opt/toolchains/dc/kos-ports/zlib/inst/ && \ kos-cmake -S. -Bbuild -RUN echo "Patching fmt to support long double..." -RUN patch build/_deps/libfmt-src/include/fmt/format.h -l -p0 < libfmt-long-double.patch - RUN echo "Compiling..." RUN source /opt/toolchains/dc/kos/environ.sh && cd build && kos-make diff --git a/libfmt-long-double.patch b/libfmt-long-double.patch deleted file mode 100644 index 40b520e3922..00000000000 --- a/libfmt-long-double.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/build/_deps/libfmt-src/include/fmt/format.h b/build/_deps/libfmt-src/include/fmt/format.h -index 7637c8a0d..92b2131ef 100644 ---- a/build/_deps/libfmt-src/include/fmt/format.h -+++ b/build/_deps/libfmt-src/include/fmt/format.h -@@ -1542,6 +1542,7 @@ template <> struct float_info { - template - struct float_info::digits == 64 || -+ std::numeric_limits::digits == 53 || - std::numeric_limits::digits == 113 || - is_float128::value>> { - using carrier_uint = detail::uint128_t; -