[PATCH] gnu: ntp: Fix cross-compilation inputs.

  • Done
  • quality assurance status badge
Details
2 participants
  • Jean-Pierre De Jesus DIAZ
  • Ludovic Courtès
Owner
unassigned
Submitted by
Jean-Pierre De Jesus DIAZ
Severity
normal
J
J
Jean-Pierre De Jesus DIAZ wrote on 7 Aug 2023 14:17
(address . guix-patches@gnu.org)(name . Jean-Pierre De Jesus DIAZ)(address . jean@foundationdevices.com)
20230807121749.60346-1-jean@foundationdevices.com
* 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 <jean@foundationdevices.com>
---
gnu/packages/ntp.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

Toggle diff (16 lines)
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
--
2.34.1
L
L
Ludovic Courtès wrote on 12 Aug 2023 22:30
(name . Jean-Pierre De Jesus DIAZ)(address . jean@foundationdevices.com)(address . 65125-done@debbugs.gnu.org)
87y1igdmv7.fsf@gnu.org
Hi,

Jean-Pierre De Jesus DIAZ <jean@foundationdevices.com> skribis:

Toggle quote (5 lines)
> * 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'.

Applied, thanks!

Ludo’.
Closed
?