guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: gnu: enigma: Fix build with GCC >= 6.


From: guix-commits
Subject: 02/03: gnu: enigma: Fix build with GCC >= 6.
Date: Fri, 24 Jul 2020 09:04:06 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 0b95f51eae50fbe627a354f50fa053a6d52b81aa
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Jul 24 12:11:42 2020 +0200

    gnu: enigma: Fix build with GCC >= 6.
    
    * gnu/packages/games.scm (enigma)[arguments]: Add phase to substitute faulty
    comparison.
---
 gnu/packages/games.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 556f813..213acc6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5841,6 +5841,14 @@ The Flag.  You can even design your own maps!")
        (list "--with-system-enet")
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-build-with-new-gcc
+           (lambda _
+             ;; Fix build with GCC6 and later by avoiding comparing ifstream
+             ;; to NULL.  Can be removed for versions > 1.21.
+             (substitute* "src/lev/Proxy.cc"
+               (("ifs != NULL")
+                "ifs"))
+             #t))
          (add-after 'unpack 'find-sdl
            (lambda _
              (substitute* "configure"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]