From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: 15/33: gnu: coreutils: Remove libcap dependency for the Hurd. Date: Wed, 11 Mar 2020 16:01:09 +0100 Message-ID: <87h7yvszpm.fsf@gnu.org> References: <20200310075832.7126.86402@vcs0.savannah.gnu.org> <20200310075847.6059A2112F@vcs0.savannah.gnu.org> <87r1y0wpdj.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:52426) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC2rB-0005jZ-65 for guix-devel@gnu.org; Wed, 11 Mar 2020 11:01:14 -0400 In-Reply-To: <87r1y0wpdj.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 10 Mar 2020 10:06:16 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org Ludovic Court=C3=A8s writes: > guix-commits@gnu.org skribis: >> ;; Drop the dependency on libcap when cross-compiling sinc= e it's >> ;; not quite cross-compilable. >> - ,@(if (%current-target-system) >> + ;; Also, libcap is not available on the Hurd. >> + ,@(if (or (%current-target-system) >> + (hurd-target?)) > > Perhaps we=E2=80=99d also need something based on =E2=80=98supported-plat= forms=E2=80=99 here. > (Not a blocker, though.) Ah yes, I think that's the right way forward. Changed it to commit 7653827b8919ad85d025ba1a701ba38ab7d2e388 Author: Jan Nieuwenhuizen Date: Sat Mar 7 03:53:38 2020 -0500 gnu: coreutils: Remove libcap dependency for the Hurd. =20=20=20=20 * gnu/packages/linux.scm (libcap)[supported-systems]: Remove the Hurd. * gnu/packages/base.scm (coreutils)[inputs]: Include libcap only for su= pported systems. Fixes building on the Hurd. diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f562a8fef7..03d9e4c0c1 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -303,11 +303,13 @@ used to apply commands with arbitrarily long argument= s.") (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp) ;bignums in 'expr', yay! =20 - ;; Drop the dependency on libcap when cross-compiling since i= t'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 is '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 e1959b905c..6bbe132476 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2068,6 +2068,7 @@ configuration (iptunnel, ipmaddr).") (assoc-ref %outputs "ou= t")) "RAISE_SETFCAP=3Dno"))) (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 I am planning a hard reset of wip-hurd when `hello' builds natively again (and cross builds), hopefully later today. janneke --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.com