futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: openclonk: Adjust for GCC 7.

Browse Source 
* gnu/packages/games.scm (openclonk)[arguments]: Add phase
'adjust-backward-cpp-includes'.
This commit is contained in:
Marius Bakke 2019-11-28 15:10:30 +01:00
parent a549802533
commit ee9eafc1df
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/games.scm
View File

@ -27,7 +27,7 @@
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2019 nee <nee-git@hidamari.blue>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2017, 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
@ -6888,6 +6888,22 @@ a fortress beyond the forbidden swamp.")
(("PATH_SUFFIXES \"src\" \"gtest\"")
"PATH_SUFFIXES \"src\""))
#t))
(add-after 'unpack 'adjust-backward-cpp-includes
(lambda _
;; XXX: The bundled backward-cpp exports a CMake "interface"
;; that includes external libraries such as libdl from glibc.
;; By default, CMake interface includes are treated as "system
;; headers", and GCC behaves poorly when glibc is passed as a
;; system header (causing #include_next failures).
;; Here we prevent targets that consume the Backward::Backward
;; interface from treating it as "system includes".
(substitute* "CMakeLists.txt"
(("target_link_libraries\\((.+) Backward::Backward\\)" all target)
(string-append "set_property(TARGET " target " PROPERTY "
"NO_SYSTEM_FROM_IMPORTED true)\n"
all)))
#t))
(add-after 'unpack 'add-libiberty
;; Build fails upon linking executables without this.
(lambda _