Subject: [bug#62178] [PATCH v1 2/5] gnu: Add futil.

From: Liliana Marie Prikler <[email-masked]>
Date: Tue, 18 Apr 2023 18:55:12 +0200

Am Donnerstag, dem 16.03.2023 um 14:29 +0800 schrieb Adam Faiz:
>  From 53d9b1d0ab260a2b2aa4ee84dd00f97517c381db Mon Sep 17 00:00:00
> 2001
> Message-Id:
> <53d9b1d0ab260a2b2aa4ee84dd00f97517c381db.1678947948.git.adam.faiz@di
> sroot.org>
> In-Reply-To:
> <735f08bc3d271959685e03d761f5ac9039e5cfd3.1678947948.git.adam.faiz@di
> sroot.org>
> References:
> <735f08bc3d271959685e03d761f5ac9039e5cfd3.1678947948.git.adam.faiz@di
> sroot.org>
> From: AwesomeAdam54321 <[email-masked]>
> Date: Tue, 14 Mar 2023 13:55:09 +0800
> Subject: [PATCH v1 2/5] gnu: Add futil.
> 
> * gnu/packages/cpp.scm (futil): New variable.
> * gnu/packages/patches/futil-add-makefile.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.
> ---
>   gnu/local.mk                                  |  1 +
>   gnu/packages/cpp.scm                          | 38 ++++++++
>   gnu/packages/patches/futil-add-makefile.patch | 92
> +++++++++++++++++++
>   3 files changed, 131 insertions(+)
>   create mode 100644 gnu/packages/patches/futil-add-makefile.patch
> 
> diff --git a/gnu/local.mk b/gnu/local.mk
> index c2521acf02..76129c9d82 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1133,6 +1133,7 @@ dist_patch_DATA
> =                                         \
>     %D%/packages/patches/freeimage-unbundle.patch               \
>     %D%/packages/patches/fuse-glibc-2.34.patch                  \
>     %D%/packages/patches/fuse-overlapping-headers.patch         \
> +  %D%/packages/patches/futil-add-makefile.patch                \
>     %D%/packages/patches/fxdiv-system-libraries.patch           \
>     %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch   \
>     %D%/packages/patches/ganeti-disable-version-symlinks.patch  \
> diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
> index ed6ae69198..5b146b3f4a 100644
> --- a/gnu/packages/cpp.scm
> +++ b/gnu/packages/cpp.scm
> @@ -1216,6 +1216,44 @@ (define-public folly
>       (supported-systems '("aarch64-linux" "x86_64-linux"))
>       (license license:asl2.0)))
>   
> +(define-public futil
> +  (let ((commit "83fcf85cf7638947a44657b2f334c2d8a2d5d02d")
> +        (revision "0"))
> +  (package
> +    (name "futil")
> +    (version (git-version "0.0.0" revision commit))
> +    (source
> +     (origin
> +       (method git-fetch)
> +       (uri (git-reference
> +             (url "https://gitlab.com/hydren/futil")
> +             (commit commit)))
> +       (file-name (git-file-name name version))
> +       (sha256
> +        (base32
> "05vyx6n4aqix3w1z76hal9zxzixfxnlw0cg4b06lc1l9gnw6ja71"))
> +       (patches
> +        (search-patches "futil-add-makefile.patch"))
> +       (modules '((guix build utils)))
> +       (snippet
> +        #~(begin
> +            (for-each
> +             (lambda (file)
> +               (install-file file "include/futil"))
> +             (find-files "." "\\.h(pp)?$"))))))
Is this snippet intended to go together with the patch?  If so, perhaps
you can adapt the patch to emit the renames as well or use a second
patch to do so rather than a snippet.
> +    (build-system gnu-build-system)
> +    (arguments
> +     (list #:tests? #f ; no tests
> +           #:phases
> +           #~(modify-phases %standard-phases
> +               (delete 'configure))
> +           #:make-flags
> +           #~(list (string-append "DESTDIR=" #$output)
> +                   "PREFIX=")))
Let PREFIX be #$output instead and leave DESTDIR empty.
> +    (home-page "https://gitlab.com/hydren/futil")
> +    (synopsis "C++ utility code library")
> +    (description "Futil is a set of C++ utility code and library
> headers.")
> +    (license license:zlib))))
> [...]

Cheers