GNU bug report logs - #31430
[PATCH 0/3] gnu: Add xtensor and its dependencies.

Previous Next

Full log

Message #53 received at 31430 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Fis Trivial <ybbs.daans <at> hotmail.com>
Cc: 31430 <at> debbugs.gnu.org
Subject: Re: [bug#31430] [PATCH 3/6] gnu: Add fifo-map.
Date: Mon, 28 May 2018 13:48:42 +0200

[Message part 1 (text/plain, inline)]

Fis Trivial <ybbs.daans <at> hotmail.com> skribis:

> * gnu/packages/cpp.scm (fifo-map): New variable.
> * gnu/packages/patches/fifo-map-fix-flags-for-gcc.patch: New file.
> * gnu/packages/patches/fifo-map-remove-catch.hpp.patch: New file.
> * gnu/local.mk: Add new patch files.

Applied with the changes below.

Ludo’.

[Message part 2 (text/x-patch, inline)]

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 5644311a1..2caf6af4d 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -155,7 +155,7 @@ batches.")
 (define-public fifo-map
   (let* ((commit "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9")
          (revision "0")
-         (version (string-append "1.1.1" revision commit)))
+         (version (git-version "1.1.1" revision commit)))
     (package
       (name "fifo-map")
       (version version)
@@ -186,11 +186,10 @@ batches.")
              (lambda* (#:key outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
                       (inc (string-append out "/include/fifo_map")))
-                 (mkdir-p inc)
                  (with-directory-excursion
                      (string-append "../" ,name "-" ,version "-checkout")
-                   (copy-file "src/fifo_map.hpp"
-                              (string-append inc "/fifo_map.hpp")))))))))
+                   (install-file "src/fifo_map.hpp" inc)
+                   #t)))))))
       (synopsis "FIFO-ordered associative container for C++")
       (description "Fifo_map is a C++ header only library for associative
 container which uses the order in which keys were inserted to the container

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.