nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Remove more GCC ICE workarounds. 

These were fixed with <https://bugs.gnu.org/31708>.

* gnu/packages/glib.scm (python-pygobject, python2-pygobject)[native-inputs]:
Remove GCC-7.
* gnu/packages/gnome.scm (gjs)[native-inputs]: Likewise.
[arguments]: Remove related phase.
This commit is contained in:
Marius Bakke 2018-12-08 02:02:51 +01:00
parent 6fac106491
commit 8a831c6f06
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/glib.scm
View File

@ -36,7 +36,6 @@
#:use-module (gnu packages enlightenment)
#:use-module (gnu packages file)
#:use-module (gnu packages flex)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gperf)
@ -621,11 +620,7 @@ useful for C++.")
(delete-file "tests/test_ossig.py")
#t)))))
(native-inputs
`(;; Use gcc-7 to work around an internal compiler error that happens
;; when using gcc-5.5.0. FIXME: Try removing this when the default
;; compiler is no longer gcc-5.5.0.
("gcc" ,gcc-7)
("which" ,which)
`(("which" ,which)
;for tests: dbus-run-session and glib-compile-schemas
("dbus" ,dbus)
("glib-bin" ,glib "bin")
@ -656,11 +651,7 @@ useful for C++.")
("python-pycairo" ,python2-pycairo)
("gobject-introspection" ,gobject-introspection)))
(native-inputs
`(;; Use gcc-7 to work around an internal compiler error that happens
;; when using gcc-5.5.0. FIXME: Try removing this when the default
;; compiler is no longer gcc-5.5.0.
("gcc" ,gcc-7)
("which" ,which)
`(("which" ,which)
;for tests: dbus-run-session and glib-compile-schemas
("dbus" ,dbus)
("glib-bin" ,glib "bin")

14
gnu/packages/gnome.scm
View File

@ -4633,14 +4633,6 @@ configuration program to choose applications starting on login.")
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'set-paths 'work-around-gcc-7-include-path-issue
;; FIXME: Work around a problem with gcc-7 includes (see
;; <https://bugs.gnu.org/30756>). Note that we use gcc-7
;; to work around an internal compiler error in gcc-5.
(lambda _
(unsetenv "C_INCLUDE_PATH")
(unsetenv "CPLUS_INCLUDE_PATH")
#t))
(add-before
'check 'pre-check
(lambda _
@ -4658,11 +4650,7 @@ configuration program to choose applications starting on login.")
((".*expect\\(datestr\\).*") ""))
#t)))))
(native-inputs
`(("gcc" ,gcc-7) ; FIXME: Work around an internal compiler error in
; gcc-5. Try removing this when our default compiler is
; no longer gcc-5.5.0, and also remove the
; 'work-around-gcc-7-include-path-issue' phase above.
("glib:bin" ,glib "bin") ; for glib-compile-resources
`(("glib:bin" ,glib "bin") ; for glib-compile-resources
("pkg-config" ,pkg-config)
("xmllint" ,libxml2)
;; For testing