From: Olivier Dion via Guix-patches via <guix-patches@gnu.org>
To: 53238@debbugs.gnu.org
Cc: Olivier Dion <olivier.dion@polymtl.ca>
Subject: [bug#53238] [PATCH] gnu: tree: Remove stddata feature.
Date: Thu, 13 Jan 2022 15:33:21 -0500 [thread overview]
Message-ID: <fee834af05b189e4efdf06977a2ccb8935aa1277.1642105304.git.olivier.dion@polymtl.ca> (raw)
* 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
next reply other threads:[~2022-01-13 20:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-13 20:33 Olivier Dion via Guix-patches via [this message]
2022-01-13 20:44 ` [bug#53238] [PATCH] gnu: tree: Remove stddata feature Tobias Geerinckx-Rice via Guix-patches via
2022-01-13 20:57 ` Olivier Dion via Guix-patches via
2022-01-13 22:26 ` Maxim Cournoyer
2022-01-13 22:33 ` Tobias Geerinckx-Rice via Guix-patches via
2022-01-14 1:55 ` Olivier Dion via Guix-patches via
2022-01-14 2:05 ` Tobias Geerinckx-Rice via Guix-patches via
2022-01-15 14:37 ` bug#53238: " Tobias Geerinckx-Rice via Bug reports for GNU Guix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fee834af05b189e4efdf06977a2ccb8935aa1277.1642105304.git.olivier.dion@polymtl.ca \
--to=guix-patches@gnu.org \
--cc=53238@debbugs.gnu.org \
--cc=olivier.dion@polymtl.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).