From 7b8c89e28283c0735bd795102e963b13bad7b7f5 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Thu, 26 Jun 2025 12:43:53 +0200 Subject: [PATCH] gnu: libreoffice: Remove gcc-12 and its related fix. * gnu/packages/libreoffice.scm (libreoffice) [arguments]{phases}: Remove fix introduced with gcc-12. [native-inputs]: Remove gcc-12. Signed-off-by: Andreas Enge --- gnu/packages/libreoffice.scm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index c8e8123e75c43f3f2a3cf4e873391be6659300c5..8e2db6861f0ab523a2f385165712e0ee827538f8 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -970,27 +970,6 @@ commonly called @code{ftoa} or @code{dtoa}.") (("/usr/bin/xdg-open") (search-input-file inputs "/bin/xdg-open"))) - ;; https://issues.guix.gnu.org/43579 - (substitute* '("sal/rtl/math.cxx" - "sc/source/core/tool/math.cxx") - (("std::(fe[gs]etround|feclearexcept|fetestexcept)" all suffix) - suffix)) - (let ((gcc-11-dir (dirname - (dirname - (dirname - (search-input-directory - inputs "share/doc/gcc-11.4.0")))))) - (setenv - "CPLUS_INCLUDE_PATH" - (string-join - (remove - (cut member <> - (list - (string-append gcc-11-dir "/include/c++") - (string-append gcc-11-dir "/include"))) - (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) - ":"))) - (setenv "CPPFLAGS" "-std=c++20"))) (add-after 'install 'reset-zip-timestamps (lambda _ @@ -1119,7 +1098,6 @@ commonly called @code{ftoa} or @code{dtoa}.") cppunit flex frozen ;header-only library - gcc-12 pkg-config python-wrapper which