all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#53238] [PATCH] gnu: tree: Remove stddata feature.
@ 2022-01-13 20:33 Olivier Dion via Guix-patches via
  2022-01-13 20:44 ` Tobias Geerinckx-Rice via Guix-patches via
  0 siblings, 1 reply; 11+ messages in thread
From: Olivier Dion via Guix-patches via @ 2022-01-13 20:33 UTC (permalink / raw)
  To: 53238; +Cc: Olivier Dion

* 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





^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-01-17 17:38 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-13 20:33 [bug#53238] [PATCH] gnu: tree: Remove stddata feature Olivier Dion via Guix-patches via
2022-01-13 20:44 ` 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-16 17:04       ` bug#53238: " Marius Bakke
2022-01-16 18:06         ` Leo Famulari
2022-01-17 17:37           ` Marius Bakke
2022-01-13 22:33     ` [bug#53238] " 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

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.