gnu: Remove GCC < 7 workarounds.
* gnu/packages/emulators.scm (dolphin-emu)[native-inputs]: Remove GCC-7. [arguments]: Adjust accordingly. * gnu/packages/games.scm (openrct2): Likewise. * gnu/packages/linux.scm (make-linux-libre): Likewise. * gnu/packages/mpd.scm (mpd): Likewise. * gnu/packages/storage.scm (ceph): Likewise.
This commit is contained in:
parent
f85ca6eda0
commit
63d4ef52eb
|
@ -151,11 +151,6 @@
|
||||||
'(#:tests? #f
|
'(#:tests? #f
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-before 'configure 'fixgcc7
|
|
||||||
(lambda _
|
|
||||||
(unsetenv "C_INCLUDE_PATH")
|
|
||||||
(unsetenv "CPLUS_INCLUDE_PATH")
|
|
||||||
#t))
|
|
||||||
(add-before 'configure 'generate-fonts&hardcore-libvulkan-path
|
(add-before 'configure 'generate-fonts&hardcore-libvulkan-path
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
(let ((fontfile
|
(let ((fontfile
|
||||||
|
@ -189,7 +184,6 @@
|
||||||
"-DX11_FOUND=1")))
|
"-DX11_FOUND=1")))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)
|
`(("pkg-config" ,pkg-config)
|
||||||
("gcc" ,gcc-7) ; Building with gcc@5 doesn't work anymore.
|
|
||||||
("gettext" ,gnu-gettext)))
|
("gettext" ,gnu-gettext)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("alsa-lib" ,alsa-lib)
|
`(("alsa-lib" ,alsa-lib)
|
||||||
|
|
|
@ -2615,16 +2615,12 @@ Transport Tycoon Deluxe.")
|
||||||
"/share/openrct2/title-sequences") "data/title")
|
"/share/openrct2/title-sequences") "data/title")
|
||||||
(copy-recursively (string-append objects
|
(copy-recursively (string-append objects
|
||||||
"/share/openrct2/objects") "data/object"))))
|
"/share/openrct2/objects") "data/object"))))
|
||||||
(add-before 'configure 'fixgcc7
|
(add-before 'configure 'get-rid-of-errors
|
||||||
(lambda _
|
|
||||||
(unsetenv "C_INCLUDE_PATH")
|
|
||||||
(unsetenv "CPLUS_INCLUDE_PATH")
|
|
||||||
#t))
|
|
||||||
(add-after 'fixgcc7 'get-rid-of-errors
|
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Don't treat warnings as errors.
|
;; Don't treat warnings as errors.
|
||||||
(substitute* "CMakeLists.txt"
|
(substitute* "CMakeLists.txt"
|
||||||
(("-Werror") "")))))))
|
(("-Werror") ""))
|
||||||
|
#t)))))
|
||||||
(inputs `(("curl" ,curl)
|
(inputs `(("curl" ,curl)
|
||||||
("fontconfig" ,fontconfig)
|
("fontconfig" ,fontconfig)
|
||||||
("freetype" ,freetype)
|
("freetype" ,freetype)
|
||||||
|
@ -2640,8 +2636,7 @@ Transport Tycoon Deluxe.")
|
||||||
("speexdsp" ,speexdsp)
|
("speexdsp" ,speexdsp)
|
||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gcc" ,gcc-7)
|
`(("pkg-config" ,pkg-config)))
|
||||||
("pkg-config" ,pkg-config)))
|
|
||||||
(home-page "https://github.com/OpenRCT2/OpenRCT2")
|
(home-page "https://github.com/OpenRCT2/OpenRCT2")
|
||||||
(synopsis "Free software re-implementation of RollerCoaster Tycoon 2")
|
(synopsis "Free software re-implementation of RollerCoaster Tycoon 2")
|
||||||
(description "OpenRCT2 is a free software re-implementation of
|
(description "OpenRCT2 is a free software re-implementation of
|
||||||
|
|
|
@ -308,10 +308,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
|
||||||
("flex" ,flex)
|
("flex" ,flex)
|
||||||
("bison" ,bison)
|
("bison" ,bison)
|
||||||
|
|
||||||
;; Build with GCC-7 for full retpoline support.
|
|
||||||
;; FIXME: Remove this when our default compiler has retpoline support.
|
|
||||||
("gcc" ,gcc-7)
|
|
||||||
|
|
||||||
;; These are needed to compile the GCC plugins.
|
;; These are needed to compile the GCC plugins.
|
||||||
("gmp" ,gmp)
|
("gmp" ,gmp)
|
||||||
("mpfr" ,mpfr)
|
("mpfr" ,mpfr)
|
||||||
|
@ -338,11 +334,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
|
||||||
(substitute* (find-files "." "^Makefile(\\.include)?$")
|
(substitute* (find-files "." "^Makefile(\\.include)?$")
|
||||||
(("/bin/pwd") "pwd"))
|
(("/bin/pwd") "pwd"))
|
||||||
#t))
|
#t))
|
||||||
(add-before 'configure 'work-around-gcc-7-include-path-issue
|
|
||||||
(lambda _
|
|
||||||
(unsetenv "C_INCLUDE_PATH")
|
|
||||||
(unsetenv "CPLUS_INCLUDE_PATH")
|
|
||||||
#t))
|
|
||||||
(replace 'configure
|
(replace 'configure
|
||||||
(lambda* (#:key inputs native-inputs target #:allow-other-keys)
|
(lambda* (#:key inputs native-inputs target #:allow-other-keys)
|
||||||
;; Avoid introducing timestamps
|
;; Avoid introducing timestamps
|
||||||
|
|
|
@ -103,17 +103,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
|
||||||
"1ix52vfa8k8my4xyr8b0phg8605b2xchyzyva908m08vpzm14w94"))))
|
"1ix52vfa8k8my4xyr8b0phg8605b2xchyzyva908m08vpzm14w94"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags '("-Ddocumentation=true") ; The default is 'false'...
|
`(#:configure-flags '("-Ddocumentation=true"))) ;the default is 'false'...
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-before 'configure 'expand-C++-include-path
|
|
||||||
;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>.
|
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
|
||||||
(let* ((path "CPLUS_INCLUDE_PATH")
|
|
||||||
(gcc (assoc-ref inputs "gcc"))
|
|
||||||
(c++ (string-append gcc "/include/c++")))
|
|
||||||
(setenv path (string-append c++ ":" (getenv path)))
|
|
||||||
#t))))))
|
|
||||||
(inputs `(("ao" ,ao)
|
(inputs `(("ao" ,ao)
|
||||||
("alsa-lib" ,alsa-lib)
|
("alsa-lib" ,alsa-lib)
|
||||||
("avahi" ,avahi)
|
("avahi" ,avahi)
|
||||||
|
@ -135,10 +125,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
|
||||||
("pulseaudio" ,pulseaudio)
|
("pulseaudio" ,pulseaudio)
|
||||||
("sqlite" ,sqlite)
|
("sqlite" ,sqlite)
|
||||||
("zlib" ,zlib)))
|
("zlib" ,zlib)))
|
||||||
;; MPD > 0.21 requires > GCC 6
|
(native-inputs `(("pkg-config" ,pkg-config)
|
||||||
(native-inputs `(("gcc" ,gcc-8)
|
|
||||||
("gcc-lib" ,gcc-8 "lib")
|
|
||||||
("pkg-config" ,pkg-config)
|
|
||||||
("python-sphinx" ,python-sphinx)))
|
("python-sphinx" ,python-sphinx)))
|
||||||
;; Missing optional inputs:
|
;; Missing optional inputs:
|
||||||
;; libyajl
|
;; libyajl
|
||||||
|
|
|
@ -237,11 +237,6 @@
|
||||||
(("^add_ceph_test\\(osd-copy-from\\.sh.*$") "\n")
|
(("^add_ceph_test\\(osd-copy-from\\.sh.*$") "\n")
|
||||||
(("^add_ceph_test\\(osd-fast-mark-down\\.sh.*$") "\n"))
|
(("^add_ceph_test\\(osd-fast-mark-down\\.sh.*$") "\n"))
|
||||||
#t)))
|
#t)))
|
||||||
(add-before 'configure 'gcc-workaround
|
|
||||||
(lambda _
|
|
||||||
(unsetenv "C_INCLUDE_PATH")
|
|
||||||
(unsetenv "CPLUS_INCLUDE_PATH")
|
|
||||||
#t))
|
|
||||||
(add-before 'check 'set-check-environment
|
(add-before 'check 'set-check-environment
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Run tests in parallel.
|
;; Run tests in parallel.
|
||||||
|
@ -289,8 +284,7 @@
|
||||||
(outputs
|
(outputs
|
||||||
'("out" "lib"))
|
'("out" "lib"))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gcc" ,gcc-7) ;7 or later is required
|
`(("gperf" ,gperf)
|
||||||
("gperf" ,gperf)
|
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("python-cython" ,python-cython)
|
("python-cython" ,python-cython)
|
||||||
("python-sphinx" ,python-sphinx)
|
("python-sphinx" ,python-sphinx)
|
||||||
|
|
Loading…
Reference in New Issue