[bug#31430] [PATCH 3/6] gnu: Add fifo-map.

[ludo@gnu.org (Ludovic Courtès)]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

Fis Trivial <ybbs.daans@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’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1267 bytes --]

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