From: Thiago Jung Bauermann via Guix-patches via <guix-patches@gnu.org>
To: 49672@debbugs.gnu.org
Cc: Maxime Devos <maximedevos@telenet.be>,
Thiago Jung Bauermann <bauermann@kolabnow.com>
Subject: [bug#49672] [PATCH v2 1/6] gnu: Fix GNU/Linux system detection
Date: Sun, 27 Mar 2022 18:40:21 -0300 [thread overview]
Message-ID: <20220327214026.102723-2-bauermann@kolabnow.com> (raw)
In-Reply-To: <20220327214026.102723-1-bauermann@kolabnow.com>
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
next prev parent reply other threads:[~2022-03-27 21:41 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 0:46 [bug#49672] [PATCH 0/9] Target check fixes and cleanups Thiago Jung Bauermann via Guix-patches via
2021-07-21 1:00 ` [bug#49672] [PATCH 1/9] gnu: Fix check of ‘%current-system’ and ‘%current-target-system’ Thiago Jung Bauermann via Guix-patches via
2021-07-21 1:00 ` [bug#49672] [PATCH 2/9] utils: Add ‘current-target-nix-system’ helper Thiago Jung Bauermann via Guix-patches via
2021-07-21 1:00 ` [bug#49672] [PATCH 3/9] gnu: Query membership in ‘supported-systems’ list with Nix identifier Thiago Jung Bauermann via Guix-patches via
2021-07-21 1:00 ` [bug#49672] [PATCH 4/9] gnu: Use ‘current-target-nix-system’ in pattern matches Thiago Jung Bauermann via Guix-patches via
2021-07-21 1:00 ` [bug#49672] [PATCH 5/9] gnu: Use ‘current-target-nix-system’ in prefix checks Thiago Jung Bauermann via Guix-patches via
2021-07-21 1:00 ` [bug#49672] [PATCH 6/9] gnu: Fix GNU/Linux system detection Thiago Jung Bauermann via Guix-patches via
2021-07-21 1:00 ` [bug#49672] [PATCH 7/9] bootloader: grub: Fix mix of GNU triplet and Nix system identifier Thiago Jung Bauermann via Guix-patches via
2021-07-21 1:00 ` [bug#49672] [PATCH 8/9] gnu: ustr: Don’t pass default argument Thiago Jung Bauermann via Guix-patches via
2021-07-21 1:00 ` [bug#49672] [PATCH 9/9] gnu: Use existing target helpers from ‘(guix utils)’ Thiago Jung Bauermann via Guix-patches via
2021-11-07 11:23 ` [bug#49672] [PATCH 0/9] Target check fixes and cleanups Maxime Devos
2021-11-12 0:56 ` Thiago Jung Bauermann via Guix-patches via
2022-03-27 21:40 ` [bug#49672] [PATCH v2 0/6] Target check fixes for cross compilation Thiago Jung Bauermann via Guix-patches via
2022-03-27 21:40 ` Thiago Jung Bauermann via Guix-patches via [this message]
2022-03-27 21:40 ` [bug#49672] [PATCH v2 2/6] gnu: libgc: Use default argument in ‘target-hurd?’ call Thiago Jung Bauermann via Guix-patches via
2022-03-27 21:40 ` [bug#49672] [PATCH v2 3/6] utils: Introduce the ‘current-target-nix-system’ procedure Thiago Jung Bauermann via Guix-patches via
2022-03-27 21:40 ` [bug#49672] [PATCH v2 4/6] gnu: Use ‘current-target-nix-system’ for matches Thiago Jung Bauermann via Guix-patches via
2022-03-27 21:40 ` [bug#49672] [PATCH v2 5/6] gnu: Query membership in ‘supported-systems’ list with Nix identifier Thiago Jung Bauermann via Guix-patches via
2022-03-27 21:40 ` [bug#49672] [PATCH v2 6/6] gnu: Fix check of ‘%current-system’ and ‘%current-target-system’ Thiago Jung Bauermann via Guix-patches via
2022-03-28 12:10 ` [bug#49672] [PATCH v2 0/6] Target check fixes for cross compilation Maxime Devos
2022-03-29 0:12 ` Thiago Jung Bauermann via Guix-patches via
2022-04-29 4:17 ` Thiago Jung Bauermann via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220327214026.102723-2-bauermann@kolabnow.com \
--to=guix-patches@gnu.org \
--cc=49672@debbugs.gnu.org \
--cc=bauermann@kolabnow.com \
--cc=maximedevos@telenet.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.