From patchwork Mon Aug 7 12:17:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 52603 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 4553727BBE2; Mon, 7 Aug 2023 13:19:19 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS 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 2CE6127BBE9 for ; Mon, 7 Aug 2023 13:19:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qSzCR-0005kH-Tc; Mon, 07 Aug 2023 08:19:03 -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 1qSzCQ-0005jx-NB for guix-patches@gnu.org; Mon, 07 Aug 2023 08:19:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSzCQ-0004fh-ED for guix-patches@gnu.org; Mon, 07 Aug 2023 08:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qSzCQ-00074L-8t for guix-patches@gnu.org; Mon, 07 Aug 2023 08:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65125] [PATCH] gnu: ntp: Fix cross-compilation inputs. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Aug 2023 12:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65125 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65125@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169141069727116 (code B ref -1); Mon, 07 Aug 2023 12:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Aug 2023 12:18:17 +0000 Received: from localhost ([127.0.0.1]:60760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSzBg-00073I-Tg for submit@debbugs.gnu.org; Mon, 07 Aug 2023 08:18:17 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSzBf-000734-0H for submit@debbugs.gnu.org; Mon, 07 Aug 2023 08:18:15 -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 1qSzBU-0005fM-2p for guix-patches@gnu.org; Mon, 07 Aug 2023 08:18:05 -0400 Received: from mail-lf1-x12c.google.com ([2a00:1450:4864:20::12c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qSzBQ-0004RA-Tx for guix-patches@gnu.org; Mon, 07 Aug 2023 08:18:02 -0400 Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-4fe58faa5cfso4720745e87.3 for ; Mon, 07 Aug 2023 05:17:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1691410677; x=1692015477; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xBknUd45zOsxafwMBvdSPPlYnuCJ1E12YriKpUWjCJw=; b=BTARfYH6fC21vqLwiEhDVtymK74MFkb7EF4UM5Kq1US4P40EJ9dDVlmVuTRbYq4f+L qtpG3Vxk5d0e5fm/VSFTunhNmQJ79cDrgG3JyY47ub/0cd/EI33FArBI+JJcA0u/q4JG 2JD3twDct4iUXFaQirk8frD7632CIpP+520fhWYZNCdC/qmIz7z/gEEcCaKvB+evfM9s 7151aIXAMwO0hrufNm1xEBIrTAHFbZNaQiS40Eb89WgThpdgybH0wY4jjtO9sRSfoVeb TblEQ5UIBh073nTA8ixC5S/9fOEzJXoouqD/R9tA0wozqMhOOupeCybJtU2NaIJYp665 Dk5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691410677; x=1692015477; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xBknUd45zOsxafwMBvdSPPlYnuCJ1E12YriKpUWjCJw=; b=bNGlKQ+pRs/E+cqWQww2ZnZMXmV21vYw3u4ezIo/js2ON5kHJVE6TgO9cVzkxhjH96 aBG/ohQjikX/e0hF6AeuANiMLH1AzoVucOBsh9AVtnw5fLdx9ka4d5k+e8KQwLc8HfLd AU0DDd7BGh4sGjGYSC2o9S8tCEF573s2XHpLenODyljjtMdBUhRcZhswkq94TQnJdTlo zaqbuMrjl3MI9TvHJp7Z/r1QjI5W3oLpk/fimK0qhNRe3mu9OkzKwQ6k3SxqIT7zPnTi RRqtBXYBEOlAb9HAdMClfyg0RLX9VXWrS5RzgLF4lQgmB9RhiqOZo8rRLq5JqHu2FdqD Nrkw== X-Gm-Message-State: AOJu0Yxv9lwgRPEHK+o4HNpnd7feb/dCin77GK/xG6ecKUNfSylpm0ht fO0INFyL34BSy3UxKK0p4rz9y6o/j1+2Y+/UGQgSPA== X-Google-Smtp-Source: AGHT+IFM0Oj08kfMzpj2Mv8Jmf0MsU/mUop4JVlN4QQFnUFBC8dXnULCLCBVxLLSYorbH9vDFk/3pQ== X-Received: by 2002:a05:6512:2822:b0:4fb:8fde:f60d with SMTP id cf34-20020a056512282200b004fb8fdef60dmr6864696lfb.22.1691410677279; Mon, 07 Aug 2023 05:17:57 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id g17-20020a7bc4d1000000b003fe26bf65e7sm10532980wmk.13.2023.08.07.05.17.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 05:17:56 -0700 (PDT) Date: Mon, 7 Aug 2023 14:17:49 +0200 Message-Id: <20230807121749.60346-1-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12c; envelope-from=jean@foundationdevices.com; helo=mail-lf1-x12c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ 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/ntp.scm (ntp)[inputs]: Use `target-linux?' instead of the manual string comparison as it would not add the libcap input correctly when cross-compiling as the platform ends in `-linux-gnu' unlike the system string which ends in `-linux'. Signed-off-by: Jean-Pierre De Jesus DIAZ --- gnu/packages/ntp.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 1a72efbc79..4ab8ab6631 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -139,8 +139,7 @@ (define-public ntp 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?) (list libcap) '()))) (arguments