[Top][All Lists]

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

01/01: gnu: kakoune: Fix build after Boost ABI change.

From: Marius Bakke
Subject: 01/01: gnu: kakoune: Fix build after Boost ABI change.
Date: Wed, 29 Mar 2017 09:44:07 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit c7f7a5bac27d6525c4f407aa31b5e9fcc0ab07d6
Author: Marius Bakke <address@hidden>
Date:   Wed Mar 29 14:23:56 2017 +0200

    gnu: kakoune: Fix build after Boost ABI change.
    Also remove now-obsolete snippet and inputs.
    * gnu/packages/text-editors.scm (kakoune)[source]: Remove gzip substitution.
    [arguments]: Drop CPPFLAGS from #:make-flags.
    [native-inputs]: Remove GCC-5.
    [inputs]: Remove gcc:lib.
 gnu/packages/text-editors.scm | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index a093baa..f860b0e 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -99,21 +99,10 @@ based command language.")
                (commit commit)))
-           "19qs99l8r9p1vi5pxxx9an22fvi7xx40qw3jh2cnh2mbacawvdyb"))
-         (modules '((guix build utils)))
-         (snippet
-          ;; Kakoune uses 'gzip' to compress its manpages. Make sure
-          ;; timestamps are not preserved for reproducibility.
-          '(begin
-             (substitute* "src/Makefile"
-               (("gzip -f") "gzip -f --no-name"))
-             #t))))
+           "19qs99l8r9p1vi5pxxx9an22fvi7xx40qw3jh2cnh2mbacawvdyb"))))
       (build-system gnu-build-system)
-       `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs 
-                            ;; Boost is compiled with the older ABI, so we 
can't use
-                            ;; the new ABI if we want to link againt it.
-                            "CPPFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0")
+       `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs 
          (modify-phases %standard-phases
            (add-after 'unpack 'patch-source
@@ -136,11 +125,9 @@ based command language.")
                ;; Out git downloader doesn't give us write permissions, but
                ;; without them the tests fail.
                (zero? (system* "chmod" "-R" "u+w" "../test")))))))
-      (native-inputs `(("gcc" ,gcc-5)
-                       ("asciidoc" ,asciidoc)
+      (native-inputs `(("asciidoc" ,asciidoc)
                        ("ruby" ,ruby)))
-      (inputs `(("gcc:lib" ,gcc-5 "lib")
-                ("ncurses" ,ncurses)
+      (inputs `(("ncurses" ,ncurses)
                 ("boost" ,boost)))
       (synopsis "Vim-inspired code editor")

reply via email to

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