[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/33: gnu: coreutils: Remove libcap dependency for the Hurd.
From: |
guix-commits |
Subject: |
12/33: gnu: coreutils: Remove libcap dependency for the Hurd. |
Date: |
Fri, 13 Mar 2020 02:45:52 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 07dd01760675036664b9bee94cb69d6d3ce8bc0e
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 | 12 +++++++-----
gnu/packages/linux.scm | 1 +
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index f562a8f..0307dc4 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -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 e1959b9..6bbe132 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2068,6 +2068,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
- 24/33: gnu: commencement: hurd-source: Update to latest git., (continued)
- 24/33: gnu: commencement: hurd-source: Update to latest git., guix-commits, 2020/03/13
- 23/33: gnu: commencement: glibc-intermediate: Build fixes for the Hurd., guix-commits, 2020/03/13
- 28/33: gnu: hurd: Update to hurd-headers version: 0.9-91a51672., guix-commits, 2020/03/13
- 25/33: gnu: commencement: gnumach-headers-boot0: Update to 1.8-116-g28b53508., guix-commits, 2020/03/13
- 29/33: daemon: Do not use clone on the Hurd., guix-commits, 2020/03/13
- 32/33: gnu: bootstrap: gcc-static: Use gcc-5., guix-commits, 2020/03/13
- 33/33: DRAFT gnu: bootstrap: Add support for the Hurd., guix-commits, 2020/03/13
- 16/33: gnu: screen: Build fix for the Hurd., guix-commits, 2020/03/13
- 05/33: gnu: make: Support for the Hurd., guix-commits, 2020/03/13
- 02/33: gnu: grub: Support for the Hurd., guix-commits, 2020/03/13
- 12/33: gnu: coreutils: Remove libcap dependency for the Hurd.,
guix-commits <=
- 07/33: gnu: fontconfig: Build fix for the Hurd., guix-commits, 2020/03/13
- 09/33: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., guix-commits, 2020/03/13
- 14/33: gnu: shepherd: Build fix for the Hurd., guix-commits, 2020/03/13
- 21/33: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/13
- 22/33: gnu: commencement: hurd-minimal-boot0: Build from tarball., guix-commits, 2020/03/13
- 26/33: gnu: commencement: static-bash-for-glibc: Hurd build fix., guix-commits, 2020/03/13
- 27/33: gnu: commencement: glibc-final: Allow gnumach-headers references., guix-commits, 2020/03/13
- 18/33: gnu: mit-krb5: Supprt for the Hurd., guix-commits, 2020/03/13
- 31/33: Revert "gnu: guile-static-stripped: Update to 2.2.", guix-commits, 2020/03/13
- 17/33: gnu: shadow: Build fix for the Hurd., guix-commits, 2020/03/13