summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2025-06-26 12:43:53 +0200
committerZheng Junjie <z572@z572.online>2025-07-06 19:00:11 +0800
commitb3b2cc7058e0bdd58eb070db7b2a7ed452770e39 (patch)
tree279e6e3267c68736f6cb5bf1149cf79d0a3e5776
parent136847b37b795c929cd610c27e8a691c884c22fb (diff)
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 <andreas@enge.fr>
-rw-r--r--gnu/packages/libreoffice.scm22
1 files changed, 0 insertions, 22 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index c8e8123e75..8e2db6861f 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