From patchwork Sun Mar 27 21:40:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 38151 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 14B5C27BBE9; Sun, 27 Mar 2022 22:41:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,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 D886527BBED for ; Sun, 27 Mar 2022 22:41:12 +0100 (BST) Received: from localhost ([::1]:35572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYadM-0006Mg-0c for patchwork@mira.cbaines.net; Sun, 27 Mar 2022 17:41:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYadC-0006Lq-Pw for guix-patches@gnu.org; Sun, 27 Mar 2022 17:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34552) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYadC-0005O9-Hn for guix-patches@gnu.org; Sun, 27 Mar 2022 17:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYadC-0004VE-G1 for guix-patches@gnu.org; Sun, 27 Mar 2022 17:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH v2 1/6] gnu: Fix GNU/Linux system detection Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Mar 2022 21:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49672@debbugs.gnu.org Cc: Maxime Devos , Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.164841725117263 (code B ref 49672); Sun, 27 Mar 2022 21:41:02 +0000 Received: (at 49672) by debbugs.gnu.org; 27 Mar 2022 21:40:51 +0000 Received: from localhost ([127.0.0.1]:56677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYad0-0004UN-Q8 for submit@debbugs.gnu.org; Sun, 27 Mar 2022 17:40:50 -0400 Received: from mx.kolabnow.com ([212.103.80.155]:18424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYacx-0004Tv-6V for 49672@debbugs.gnu.org; Sun, 27 Mar 2022 17:40:47 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 7AC6F141B; Sun, 27 Mar 2022 23:40:40 +0200 (CEST) Authentication-Results: ext-mx-out002.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1648417240; x=1650231641; bh=GV+j+K6th9jDA4oAyYqDrvJE3b1Amy8Zx1c 1aM4jfYo=; b=kbfe92cVPzSq5LtPMo1lE/tgWIetmWAofbv6R3fkPp23K6gEizB 5W91zPKt1JUlmWOgOxV69kY+zTXnrwmyu4v7V3DvErlJ27dx7WjjC/GozZzSNEfZ ETteFj2fHj5oN5+79NUL0JZbPBheniotYCEZz5iZ+haRlZlY4qUJmOcKBh6lqFrb CEcn6qZCRp8yWiqvR5K6AyIPXBYCD/wDb1WpNhPFJWst9yoR5rEammvJzwjNtX97 m2Gx5C9h0s875Ojo1iQHtzTfP6cj6R1wET7vMMhUDBfl6Zgnw8yBzjnGc6RsdsV0 afF4xHzSbk5F6ig6i4fcQgAv1MoHvIj+YIRNO0bVWne2Q3lr01WmMHSqOgg0vtb0 4G4PvXk7cugHS2zJx1/C5McS6/Qzc3r06Zn2z3CnlBmVd5hNRSPF4Y4mgQK3U+pR d4Tmf5MoV79a/HEK9C6ADcVL2eQNWCybZkPbASrZH5yaCD4VPj5JmGpKcqbf6D2F LC3f8ZMSzWJ3rxNWPmcTWinOnS5iYHnQ5Zg7He4Hy0jSiS/6O9qzYYZmFs5baF+5 G0cofjVMJ86nrPG3iwyCXQ1oHyp9muHOYy38LVqLG050mAc0O8uKDm3yfMQ8qdjm E22xos+oNJvI3txPmwL6Yp80S3z3A/ClcWNhTdXJZ5tmZ1FYbBQjnx7o= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xtfrv3kqQS_9; Sun, 27 Mar 2022 23:40:40 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by mx.kolabnow.com (Postfix) with ESMTPS id DF0C71419; Sun, 27 Mar 2022 23:40:39 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx001.mykolab.com (Postfix) with ESMTPS id BFEF0BC9; Sun, 27 Mar 2022 23:40:38 +0200 (CEST) Date: Sun, 27 Mar 2022 18:40:21 -0300 Message-Id: <20220327214026.102723-2-bauermann@kolabnow.com> In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com> References: <20220327214026.102723-1-bauermann@kolabnow.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches The current code isn’t strictly correct because the GNU triplet in ‘%current-target-system’ could end in “linux-gnu”. The helper works in all cases. * gnu/packages/messaging.scm (ngircd)[inputs]: Use ‘target-linux?’. [arguments]<#:configure-flags>: Likewise. * gnu/packages/ntp.scm (ntp)[inputs]: Likewise --- gnu/packages/messaging.scm | 8 ++------ gnu/packages/ntp.scm | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f40c3a7e2ccb..44809754212a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -899,17 +899,13 @@ (define-public ngircd (inputs `(("zlib" ,zlib) ("libwrap" ,tcp-wrappers) ("gnutls" ,gnutls) - ,@(if (string-suffix? "-linux" - (or (%current-target-system) - (%current-system))) + ,@(if (target-linux?) `(("linux-pam" ,linux-pam)) '()))) (arguments `(#:configure-flags '("--with-gnutls" "--with-iconv" "--enable-ipv6" "--with-tcp-wrappers" - ,@(if (string-suffix? "-linux" - (or (%current-target-system) - (%current-system))) + ,@(if (target-linux?) '("--with-pam") '())) #:phases diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 7a3c033b2e12..d7f99c614ed8 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -148,8 +148,7 @@ (define-public ntp ("libevent" ,libevent) ;; Build with POSIX capabilities support on GNU/Linux. This allows 'ntpd' ;; to run as non-root (when invoked with '-u'.) - ,@(if (string-suffix? "-linux" - (or (%current-target-system) (%current-system))) + ,@(if (target-linux?) `(("libcap" ,libcap)) '()))) (arguments