[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch core-updates updated: gnu: coreutils: Remove libcap dependency fo
From: |
guix-commits |
Subject: |
branch core-updates updated: gnu: coreutils: Remove libcap dependency for the Hurd. |
Date: |
Sat, 14 Mar 2020 04:25:57 -0400 |
This is an automated email from the git hooks/post-receive script.
janneke pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new 11a5ffb gnu: coreutils: Remove libcap dependency for the Hurd.
11a5ffb is described below
commit 11a5ffba7327250ebe7b67c777204e49858310bb
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sat Mar 7 03:53:38 2020 -0500
gnu: coreutils: Remove libcap dependency for the Hurd.
* gnu/packages/linux.scm (libcap)[supported-systems]: Remove the Hurd.
* gnu/packages/base.scm (coreutils)[inputs]: Include libcap only for
supported
systems. Fixes building on the Hurd.
---
gnu/packages/base.scm | 14 ++++++++------
gnu/packages/linux.scm | 2 ++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f048e4b..d74d304 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2014 Alex Kost <address@hidden>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <address@hidden>
;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <address@hidden>
-;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
+;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
;;; Copyright © 2016, 2018 Alex Vong <address@hidden>
;;; Copyright © 2017 Rene Saavedra <address@hidden>
;;; Copyright © 2017, 2020 Mathieu Othacehe <address@hidden>
@@ -303,11 +303,13 @@ used to apply commands with arbitrarily long arguments.")
(inputs `(("acl" ,acl) ; TODO: add SELinux
("gmp" ,gmp) ;bignums in 'expr', yay!
- ;; Drop the dependency on libcap when cross-compiling since it's
- ;; not quite cross-compilable.
- ,@(if (%current-target-system)
- '()
- `(("libcap" ,libcap))))) ;capability support is 'ls', etc.
+ ;; Do not use libcap when cross-compiling since it's not quite
+ ;; cross-compilable; and use it only for supported systems.
+ ,@(if (and (not (%current-target-system))
+ (not (member (%current-system)
+ (package-supported-systems libcap))))
+ `(("libcap" ,libcap)) ;capability support in 'ls', etc.
+ '())))
(native-inputs
;; Perl is needed to run tests in native builds, and to run the bundled
;; copy of help2man. However, don't pass it when cross-compiling since
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e9f261e..977f448 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -42,6 +42,7 @@
;;; Copyright © 2020 Pierre Neidhardt <address@hidden>
;;; Copyright © 2020 Chris Marusich <address@hidden>
;;; Copyright © 2020 Vincent Legoll <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2068,6 +2069,7 @@ configuration (iptunnel, ipmaddr).")
(assoc-ref %outputs "out"))
"RAISE_SETFCAP=no")))
(native-inputs `(("perl" ,perl)))
+ (supported-systems (delete "i586-gnu" %supported-systems))
(home-page "https://sites.google.com/site/fullycapable/")
(synopsis "Library for working with POSIX capabilities")
(description
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch core-updates updated: gnu: coreutils: Remove libcap dependency for the Hurd.,
guix-commits <=