[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: Remove more GCC ICE workarounds.
From: |
guix-commits |
Subject: |
05/06: gnu: Remove more GCC ICE workarounds. |
Date: |
Sat, 8 Dec 2018 13:38:27 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 8a831c6f0699953a878dae07250c17a34a6025bf
Author: Marius Bakke <address@hidden>
Date: Sat Dec 8 02:02:51 2018 +0100
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.
---
gnu/packages/glib.scm | 13 ++-----------
gnu/packages/gnome.scm | 14 +-------------
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 491f688..cd9b48c 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -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")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fe3c8b8..415398e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -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
- branch master updated (e0ae7e7 -> 08861d2), guix-commits, 2018/12/08
- 01/06: gnu: elogind: Update to 239.3., guix-commits, 2018/12/08
- 03/06: gnu: address@hidden: Update to 7.4.0., guix-commits, 2018/12/08
- 04/06: gnu: feh: Update to 3.1.1., guix-commits, 2018/12/08
- 02/06: gnu: address@hidden: Update to 6.5.0., guix-commits, 2018/12/08
- 06/06: gnu: python-pyaml: Update to 18.11.0., guix-commits, 2018/12/08
- 05/06: gnu: Remove more GCC ICE workarounds.,
guix-commits <=