From patchwork Mon Mar 13 01:21:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 47928 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 99E4616DC0; Mon, 13 Mar 2023 01:23:21 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 F2CF916D7C for ; Mon, 13 Mar 2023 01:23:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbWu2-00084J-8x; Sun, 12 Mar 2023 21:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pbWu0-000833-A6 for guix-patches@gnu.org; Sun, 12 Mar 2023 21:23:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pbWtz-0003gg-1M for guix-patches@gnu.org; Sun, 12 Mar 2023 21:23:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbWty-0000Ix-SU for guix-patches@gnu.org; Sun, 12 Mar 2023 21:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62154] [PATCH 2/4] gnu: inetutils: Convert to gexp. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Mar 2023 01:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62154 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62154@debbugs.gnu.org Cc: Felix Lechner Received: via spool by 62154-submit@debbugs.gnu.org id=B62154.16786705341074 (code B ref 62154); Mon, 13 Mar 2023 01:23:02 +0000 Received: (at 62154) by debbugs.gnu.org; 13 Mar 2023 01:22:14 +0000 Received: from localhost ([127.0.0.1]:33281 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbWtA-0000H2-1E for submit@debbugs.gnu.org; Sun, 12 Mar 2023 21:22:14 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:43472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbWt7-0000Ga-TW for 62154@debbugs.gnu.org; Sun, 12 Mar 2023 21:22:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=zdMXfAuNlOqf/fp WLhSa3wMv4u5Nr95AweTq/IFHvxE=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=kW78eaKQzP85ZxmWSkdo2d5mvK+qfbGCGb3gL0ot gVJu23bvqoe+RAGrfMsKnKDr2LclPBDOxbxdTg08Ff4FUFHq1Vpit2b4prhjJAnLKpG0/h Ti5uuLF3JukXrCWFIU7CuVNYCkomumgo+5Q9ybRAQNcAszlHK/1k/2F8DEaGc= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 45ccc77e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Mon, 13 Mar 2023 01:22:09 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 1c2f379a; Mon, 13 Mar 2023 01:22:08 +0000 (UTC) Date: Sun, 12 Mar 2023 18:21:54 -0700 Message-Id: <9068daeaf9a19703a1be22178c0e34cbf1d54cef.1678669618.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (inetutils): Convert to gexp. --- gnu/packages/admin.scm | 52 ++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 77c7577cfa..8147274b77 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -906,32 +906,34 @@ (define-public inetutils "1ck81y6x0bk1qaripfsrbfzrrzaxkzp37ddpg8mgwzd5n6qxd28p")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--localstatedir=/var" + (list + #:configure-flags + #~(list "--localstatedir=/var" - ;; Make sure 'PATH_PROCNET_DEV' gets defined when - ;; cross-compiling (by default it does not.) - ,@(if (%current-target-system) - '("--with-path-procnet-dev=/proc/net/dev") - '()) - ,@(if (hurd-target?) - '("--disable-rcp" - "--disable-rexec" - "--disable-rexecd" - "--disable-rlogin" - "--disable-rlogind" - "--disable-rsh" - "--disable-rshd" - "--disable-uucpd" - "--disable-whois") - '())) - ;; Make sure that canonical "coreutils" package is not referred. - #:make-flags - (list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\"" - (assoc-ref %build-inputs "coreutils*") - "/bin/cp\\\"")) - ;; On some systems, 'libls.sh' may fail with an error such as: - ;; "Failed to tell switch -a apart from -A". - #:parallel-tests? #f)) + ;; Make sure 'PATH_PROCNET_DEV' gets defined when + ;; cross-compiling (by default it does not.) + #$@(if (%current-target-system) + '("--with-path-procnet-dev=/proc/net/dev") + '()) + #$@(if (hurd-target?) + '("--disable-rcp" + "--disable-rexec" + "--disable-rexecd" + "--disable-rlogin" + "--disable-rlogind" + "--disable-rsh" + "--disable-rshd" + "--disable-uucpd" + "--disable-whois") + '())) + ;; Make sure that canonical "coreutils" package is not referred. + #:make-flags + #~(list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\"" + #$(this-package-input "coreutils*") + "/bin/cp\\\"")) + ;; On some systems, 'libls.sh' may fail with an error such as: + ;; "Failed to tell switch -a apart from -A". + #:parallel-tests? #f)) (inputs `(("coreutils*" ,coreutils) ("shadow" ,shadow) ;for login (used in telnetd and rlogind) ("ncurses" ,ncurses)