mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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>
This commit is contained in:
parent
3dcd1307d1
commit
7b8c89e282
1 changed files with 0 additions and 22 deletions
|
@ -970,27 +970,6 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
||||||
(("/usr/bin/xdg-open")
|
(("/usr/bin/xdg-open")
|
||||||
(search-input-file inputs "/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")))
|
(setenv "CPPFLAGS" "-std=c++20")))
|
||||||
(add-after 'install 'reset-zip-timestamps
|
(add-after 'install 'reset-zip-timestamps
|
||||||
(lambda _
|
(lambda _
|
||||||
|
@ -1119,7 +1098,6 @@ commonly called @code{ftoa} or @code{dtoa}.")
|
||||||
cppunit
|
cppunit
|
||||||
flex
|
flex
|
||||||
frozen ;header-only library
|
frozen ;header-only library
|
||||||
gcc-12
|
|
||||||
pkg-config
|
pkg-config
|
||||||
python-wrapper
|
python-wrapper
|
||||||
which
|
which
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue