guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: inkscape: Fix FTBFS with GCC >= 6.


From: Marius Bakke
Subject: 02/02: gnu: inkscape: Fix FTBFS with GCC >= 6.
Date: Sun, 7 Oct 2018 14:12:56 -0400 (EDT)

mbakke pushed a commit to branch wip-gcc7
in repository guix.

commit ebcdfca4fea05c29bdbd01bc6b7955f9ceaa3b9a
Author: Marius Bakke <address@hidden>
Date:   Sun Oct 7 18:54:59 2018 +0200

    gnu: inkscape: Fix FTBFS with GCC >= 6.
    
    * gnu/packages/inkscape.scm (inkscape)[arguments]: Add phase
    'dont-use-system-includes.
---
 gnu/packages/inkscape.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 1673cc6..d814a0f 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -103,6 +103,13 @@
            (lambda _
              (substitute* "share/icons/application/CMakeLists.txt"
               (("gtk-update-icon-cache") "true"))
+             #t))
+         (add-before 'configure 'dont-use-system-includes
+           (lambda _
+             ;; Don't add redundant -isystem includes which confuses GCC7.
+             (substitute* "CMakeScripts/DefineDependsandFlags.cmake"
+               (("include_directories\\(SYSTEM")
+                "include_directories("))
              #t)))))
     (home-page "https://inkscape.org/";)
     (synopsis "Vector graphics editor")



reply via email to

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