ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: coreutils: Remove libcap dependency for the Hurd.

Browse source 
* 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.
This commit is contained in:
Jan Nieuwenhuizen 2020-03-07 03:53:38 -05:00
parent 4889be6ceb
commit 11a5ffba73
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/base.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2014 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org> ;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
@ -303,11 +303,13 @@ (define-public coreutils
(inputs `(("acl" ,acl) ; TODO: add SELinux (inputs `(("acl" ,acl) ; TODO: add SELinux
("gmp" ,gmp) ;bignums in 'expr', yay! ("gmp" ,gmp) ;bignums in 'expr', yay!
;; Drop the dependency on libcap when cross-compiling since it's ;; Do not use libcap when cross-compiling since it's not quite
;; not quite cross-compilable. ;; cross-compilable; and use it only for supported systems.
,@(if (%current-target-system) ,@(if (and (not (%current-target-system))
'() (not (member (%current-system)
`(("libcap" ,libcap))))) ;capability support is 'ls', etc. (package-supported-systems libcap))))
`(("libcap" ,libcap)) ;capability support in 'ls', etc.
'())))
(native-inputs (native-inputs
;; Perl is needed to run tests in native builds, and to run the bundled ;; 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 ;; copy of help2man. However, don't pass it when cross-compiling since

2
gnu/packages/linux.scm
View file

@ -42,6 +42,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -2068,6 +2069,7 @@ (define-public libcap
(assoc-ref %outputs "out")) (assoc-ref %outputs "out"))
"RAISE_SETFCAP=no"))) "RAISE_SETFCAP=no")))
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))
(supported-systems (delete "i586-gnu" %supported-systems))
(home-page "https://sites.google.com/site/fullycapable/") (home-page "https://sites.google.com/site/fullycapable/")
(synopsis "Library for working with POSIX capabilities") (synopsis "Library for working with POSIX capabilities")
(description (description