From patchwork Thu Jan 13 20:33:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Dion X-Patchwork-Id: 36293 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C996927BBEA; Thu, 13 Jan 2022 20:34:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9C0D627BBE9 for ; Thu, 13 Jan 2022 20:34:25 +0000 (GMT) Received: from localhost ([::1]:51060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n86ng-0008LW-Ku for patchwork@mira.cbaines.net; Thu, 13 Jan 2022 15:34:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n86nK-0008HL-JK for guix-patches@gnu.org; Thu, 13 Jan 2022 15:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n86nK-00068t-9w for guix-patches@gnu.org; Thu, 13 Jan 2022 15:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n86nK-0001pP-43 for guix-patches@gnu.org; Thu, 13 Jan 2022 15:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53238] [PATCH] gnu: tree: Remove stddata feature. Resent-From: Olivier Dion Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Jan 2022 20:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53238 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53238@debbugs.gnu.org Cc: Olivier Dion X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16421060226996 (code B ref -1); Thu, 13 Jan 2022 20:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jan 2022 20:33:42 +0000 Received: from localhost ([127.0.0.1]:34686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n86n0-0001om-DB for submit@debbugs.gnu.org; Thu, 13 Jan 2022 15:33:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:52342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n86mv-0001oY-EX for submit@debbugs.gnu.org; Thu, 13 Jan 2022 15:33:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n86mu-0007zu-3g for guix-patches@gnu.org; Thu, 13 Jan 2022 15:33:37 -0500 Received: from smtp.polymtl.ca ([132.207.4.11]:42042) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n86mq-00066q-Cw for guix-patches@gnu.org; Thu, 13 Jan 2022 15:33:34 -0500 Received: from laura.hitronhub.home (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 20DKXMB9003161 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 13 Jan 2022 15:33:29 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 20DKXMB9003161 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1642106010; bh=ASeLr+ajKDXr1obrM9FFYIcIvZ08oaYL6guaEJfOwug=; h=From:To:Cc:Subject:Date:From; b=GT2NKY9xWDJkkkg6IyBXAGYx/5IuKH0as/cWXFuTke4mJrOjl+2I7/S/u8nsPQPDg 7rgwVSiAkirTyYfFShJtx/M8rsZv6WJqH+/T/FeZB7H0lJNe+EFFg+/Z5+/D44rZyU WY753mGP76jW5SWc5pcF0FF7DSLdSE+0IGCestfQ= Date: Thu, 13 Jan 2022 15:33:21 -0500 Message-Id: X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-Poly-FromMTA: (modemcable094.169-200-24.mc.videotron.ca [24.200.169.94]) at Thu, 13 Jan 2022 20:33:22 +0000 Received-SPF: pass client-ip=132.207.4.11; envelope-from=olivier.dion@polymtl.ca; helo=smtp.polymtl.ca X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Olivier Dion X-ACL-Warn: , Olivier Dion via Guix-patches X-Patchwork-Original-From: Olivier Dion via Guix-patches via From: Olivier Dion X-getmail-retrieved-from-mailbox: Patches * 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