From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EKbKARty92C6+gAAgWs5BA (envelope-from ) for ; Wed, 21 Jul 2021 03:02:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id yM/yOBpy92DbKgAAbx9fmQ (envelope-from ) for ; Wed, 21 Jul 2021 01:02:18 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A92F117D23 for ; Wed, 21 Jul 2021 03:02:18 +0200 (CEST) Received: from localhost ([::1]:39260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m60cr-0007rx-N1 for larch@yhetil.org; Tue, 20 Jul 2021 21:02:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m60ce-0007Qv-Ju for guix-patches@gnu.org; Tue, 20 Jul 2021 21:02:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52469) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m60ce-0007ii-CW for guix-patches@gnu.org; Tue, 20 Jul 2021 21:02:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m60ce-00009X-BQ for guix-patches@gnu.org; Tue, 20 Jul 2021 21:02:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49672] [PATCH 6/9] gnu: Fix GNU/Linux system detection Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Jul 2021 01:02:04 +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: Thiago Jung Bauermann Received: via spool by 49672-submit@debbugs.gnu.org id=B49672.1626829301483 (code B ref 49672); Wed, 21 Jul 2021 01:02:04 +0000 Received: (at 49672) by debbugs.gnu.org; 21 Jul 2021 01:01:41 +0000 Received: from localhost ([127.0.0.1]:35765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m60cH-00007j-00 for submit@debbugs.gnu.org; Tue, 20 Jul 2021 21:01:41 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:46654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m60cF-00007A-Qs for 49672@debbugs.gnu.org; Tue, 20 Jul 2021 21:01:40 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id 489B8998 for <49672@debbugs.gnu.org>; Wed, 21 Jul 2021 03:01:34 +0200 (CEST) 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= 1626829293; x=1628643694; bh=Eon/idi5y3gj5ZKZmx/KKYPfEF2gcOTgCg+ 5H0aBNQA=; b=0K7QI+CeNCULGsv7cn86mdH0T7Jj9GKr6Yc2hmZ0GdPTjtt7StV aCPw/EFui6cKcSvbygFVBeQNwHDlWgniodw2osbPnc4kG9pB3rrC6cTP1qRsh2TX XQtvj1kyXshmV4nSzF/VtbmV44T5w0lFA4RBEdXv1MZFCWIaE1kyPrRlwy0tFt9K ZVaLlIPQuD7OTxvMimhUQQFkw+D5mcY466HWvuW0ZaOxF9N9DLNW2rHcB0GMksgp ONw26J/iq9SsbRCuiF7GmppcbTjHBjryPjZdXRXahQHJSStBr+4oxxAPnf6RMVSa g/1LD+ze14coDgiL40G9vn+2LyBFD7L00XXzQ/Q3FdSFban+OFrTOIbdb7slLAMk F6AnuWCeIQ3pmc7CsCPA8OPRg0+TXKOiBrL+isjx3D/6/QDha98gDcdtz9lF8i0H k00GVH3BZMnWKzu7RIsdfNbxDMoT8REs1oZRXL5qaDbEvJjChIygUxfsA2ujyaJm a92m8+OTlFlC5ceiQuvFbEt6pem9v7qLak9S7oSwh0XIU+uolN5G4Xa5Nl89WIB6 rh/ZCmc7W+hgrLa/xTh6dx7OBtYY/bTbO0QCareChCS7FDKeRA38vDCXD6xUaEIs 14dKAunZZhpAZIJEGi4Ub3NsbMyxZpZ1f3mqRfEUPjBRArNHz1qxF+C4= 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 RzWlPdRIhTAS for <49672@debbugs.gnu.org>; Wed, 21 Jul 2021 03:01:33 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id A657FD3 for <49672@debbugs.gnu.org>; Wed, 21 Jul 2021 03:01:33 +0200 (CEST) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx002.mykolab.com (Postfix) with ESMTPS id BB40E4337; Wed, 21 Jul 2021 03:01:32 +0200 (CEST) Date: Tue, 20 Jul 2021 22:00:40 -0300 Message-Id: <20210721010043.632012-6-bauermann@kolabnow.com> In-Reply-To: <20210721010043.632012-1-bauermann@kolabnow.com> References: <20210721010043.632012-1-bauermann@kolabnow.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches From: Thiago Jung Bauermann via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626829338; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Eon/idi5y3gj5ZKZmx/KKYPfEF2gcOTgCg+5H0aBNQA=; b=ogvRGyghxOoDTsYJDWv/zAiQk4GAbTowLJ1Lto218zuvZWZglf06YmsIG8YCTpDvTfq7K6 DGykbnNpiteZis2eUmItzJxvkAIaG8foqZ2X5c63nh3oNP3QBT0nv6NGv0SovmWxTtsZE0 2whhz8+eqLOeylUs6ZEn+WhSe+8gcRFL73RFqsp0WGdhvNlvGmhT9hyvV/XS9KH0qDn9bN 24wC4pCBhxuO96BZXx+iRj4AXFNE3vuEl4GjLqoOegaUtR7yu1q9oVhszJxzNdbbGn1hNe HYQLrDJymwvzLsKpZgQ4Eq5l3CJy65bOBxogU6QjyDugRomzkUYJsso+W1MhtA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626829338; a=rsa-sha256; cv=none; b=RLuXAxyj+hGm93gGNqPr3C8eWJrmptXiA5D8XGgjzNmuuJ0A6c+XEUPHonm/Oxp6NNkjzv 5dXhy4g2a/kpZdWFA+kz+QxNF3wLw2q105CU/cLJxH3IqzfqDxvrDd2sebh9+jxNmxef2s DmFCVP2KmQeCRl3aCn7sXPdlgRt4fEFDIj+UsDPFpfD9UAcTZUAv2fCr6DbgOVIxpUIzIa liACg4KZ8g3R2B7T0gClFC+pt61+/Sv7sYVwPiTKVcGux64X+T6U9tedwvuAJpuFVHriyl 2IcmxQjqbVQKGIzCotciAvC5OAcEowc8Cm0Tr4UxVeUR7A+PuntHlE2U/TkSVQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=0K7QI+Ce; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=0K7QI+Ce; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: A92F117D23 X-Spam-Score: -2.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: V3NhByZEvM2R The current code isn’t strictly correct because the GNU triplet in ‘%current-target-system’ could end in “linux-gnu”. Instead, check whether either of the system identifiers contain the string “-linux”. * gnu/packages/messaging.scm (ngircd)[inputs]: Use ‘string-contains’. [arguments]<#:configure-flags>: Likewise. * gnu/packages/ntp.scm (ntp)[inputs]: Likewise --- gnu/packages/messaging.scm | 12 ++++++------ gnu/packages/ntp.scm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e5ecdb889441..f18de2a1295d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -781,17 +781,17 @@ dictionaries. HexChat can be extended with multiple addons.") (inputs `(("zlib" ,zlib) ("libwrap" ,tcp-wrappers) ("gnutls" ,gnutls) - ,@(if (string-suffix? "-linux" - (or (%current-target-system) - (%current-system))) + ,@(if (string-contains (or (%current-target-system) + (%current-system)) + "-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 (string-contains (or (%current-target-system) + (%current-system)) + "-linux") '("--with-pam") '())) #:phases diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 191eedd15875..de501199596c 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -154,8 +154,8 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.") ("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 (string-contains (or (%current-target-system) (%current-system)) + "-linux") `(("libcap" ,libcap)) '()))) (arguments