bug#53238: closed (password-store fails to build with tree version 2)

[GNU bug Tracking System]

Your message dated Mon, 17 Jan 2022 18:37:26 +0100
with message-id <87sftm6z6x.fsf@gnu.org>
and subject line Re: bug#53238: [PATCH] gnu: tree: Remove stddata feature.
has caused the debbugs.gnu.org bug report #53238,
regarding password-store fails to build with tree version 2
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
53238: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=53238
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: tree: Remove stddata feature.
>
>
>
>
> Date: 
>
> Thu, 13 Jan 2022 15:33:21 -0500
>
>
>
>
> * gnu/packages/admin.scm (tree)
> [arguments]: Add 'remove-stddata-feature phase after 'unpack phase.
>
> Since version 2.0.0, there's a new feature call `stddata`.
>
> >From the ChangeLog:
> --------------------------------------------------------------------------------
> Output un-indented JSON on file descriptor 3 ("stddata") automatically if file
> descriptor 3 is present (currently Linux only.) Maybe switch to BSON.
> --------------------------------------------------------------------------------
>
> This feature breaks some UNIX utilities.  Fix it by disabling the feature.
> ---
>  gnu/packages/admin.scm | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index f11374a439..3d4909176a 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -2408,6 +2408,14 @@ (define-public tree
>       (list
>         #:phases
>         #~(modify-phases %standard-phases
> +           (add-after 'unpack 'remove-stddata-feature
> +             (lambda _
> +               (substitute* "tree.h"
> +                 (("#  define STDDATA_FILENO 3")
> +                  ""))
> +               (substitute* "tree.c"
> +                 (("#ifdef __linux__")
> +                  "#ifdef STDDATA_FILENO"))))
>             (delete 'configure))         ; No configure script.
>         #:tests? #f                      ; No check target.
>         #:make-flags
> -- 
> 2.34.0
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: bug#53238: [PATCH] gnu: tree: Remove stddata feature. Date: Mon, 17 Jan 2022 18:37:26 +0100

Upstream fix pushed in 5da4cbfbd94163f87f188355e5490f04dd6864c2.

signature.asc
Description: PGP signature

--- End Message ---