Package: guix-patches;
Reported by: Christopher Baines <mail <at> cbaines.net>
Date: Thu, 16 May 2024 15:01:02 UTC
Severity: normal
Tags: patch
Done: Christopher Baines <mail <at> cbaines.net>
Bug is archived. No further changes may be made.
Message #65 received at 70985 <at> debbugs.gnu.org (full text, mbox):
From: Efraim Flashner <efraim <at> flashner.co.il> To: Christopher Baines <mail <at> cbaines.net> Cc: 70985 <at> debbugs.gnu.org Subject: Re: [bug#70985] [PATCH v2 5/6] gnu: rust: Guard against cross-libc returning #f. Date: Tue, 9 Jul 2024 18:21:05 +0300
[Message part 1 (text/plain, inline)]
On Tue, Jul 09, 2024 at 11:25:04AM +0200, Christopher Baines wrote:
> Efraim Flashner <efraim <at> flashner.co.il> writes:
>
> > On Fri, Jul 05, 2024 at 06:06:02PM +0200, Christopher Baines wrote:
> >> * gnu/packages/rust.scm (make-rust-sysroot/implementation): Guard against
> >> cross-libc returning #f.
> >>
> >> Change-Id: Ia0d5c889c6f5cd3478ad985c79feb9ba1c472c29
> >> ---
> >> gnu/packages/rust.scm | 10 ++++++++--
> >> 1 file changed, 8 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
> >> index a385344473..f1de34b277 100644
> >> --- a/gnu/packages/rust.scm
> >> +++ b/gnu/packages/rust.scm
> >> @@ -73,7 +73,9 @@ (define-module (gnu packages rust)
> >> #:use-module (ice-9 match)
> >> #:use-module (ice-9 optargs)
> >> #:use-module (srfi srfi-1)
> >> - #:use-module (srfi srfi-26))
> >> + #:use-module (srfi srfi-26)
> >> + #:use-module (srfi srfi-34)
> >> + #:use-module (srfi srfi-35))
> >>
> >> ;; This is the hash for the empty file, and the reason it's relevant is not
> >> ;; the most obvious.
> >> @@ -1464,7 +1466,11 @@ (define make-rust-sysroot/implementation
> >> (modify-inputs (package-native-inputs base-rust)
> >> (prepend (cross-gcc target
> >> #:libc (cross-libc target))
> >> - (cross-libc target)
> >> + (or (cross-libc target) ; could be #f
> >> + (raise (condition
> >> + (&package-unsupported-target-error
> >> + (package (libc-for-target target))
> >> + (target target)))))
> >> (cross-binutils target)))))
> >> (properties
> >> `((hidden? . #t)
> >> --
> >> 2.45.2
> >
> > This will probably work:
> >
> > (native-inputs
> > `((,(string-append "gcc-cross-" target) ,(cross-gcc target
> > #:libc (cross-libc target)))
> > ,(when (false-if-exception (cross-libc target))
> > `(,(string-append "glibc-cross-" target) ,(cross-libc target)))
> > (,(string-append "binutils-cross-" target) ,(cross-binutils target))
> > ,(when (target-mingw? target)
> > (if (string=? "i686-w64-mingw32" target)
> > `("mingw-w64-i686-winpthreads" ,mingw-w64-i686-winpthreads)
> > `("mingw-w64-x86_64-winpthreads" ,mingw-w64-x86_64-winpthreads)))
> > ,@(package-native-inputs base-rust)))
>
> Thanks for taking a look. In the latest patches cross-libc isn't
> changing to raise an exception (as that ended up being too complicated),
> so I'm not sure the false-if-exception is going to work.
false-if-exception should work. We use it a couple of times in golang
packaging to skip the tests if we're building with gccgo.
(unless
;; The tests fail when run with gccgo.
(false-if-exception (search-input-file inputs "/bin/gccgo"))
(apply (assoc-ref %standard-phases 'check) args)))))))
> I'd also maybe stick with modify-inputs, as at least that avoids the
> older inputs style.
>
> If I've followed your first email correctly, are you thinking of
> something like this?
>
> (native-inputs
> (if (target-mingw? target)
> (modify-inputs (package-native-inputs base-rust)
> (prepend (cross-gcc target
> #:libc (cross-libc target))
> (cross-binutils target)
> (if (string=? "i686-w64-mingw32" target)
> mingw-w64-i686-winpthreads
> mingw-w64-x86_64-winpthreads)))
> (modify-inputs (or (and=> (cross-libc target)
> (lambda (x-libc)
> (modify-inputs
> (package-native-inputs base-rust)
> (prepend x-libc))))
> (package-native-inputs base-rust))
> (prepend (cross-gcc target
> #:libc (cross-libc target))
> (cross-binutils target)))))
Thanks, I hate it :) That said, if it works then it's fine. (I lose my
confidence from (cross-libc target) getting renamed to x-libc)
I played around with it a bit more. The problem is that we can only
logic our way around before modify-inputs or inside
prepend/append/delete, so options are a bit limited as to what we can
do. I came up with the following, which I think should also work:
(native-inputs
(modify-inputs (package-native-inputs base-rust)
(prepend (cross-binutils target))
(prepend
(cond ((and (target-mingw? target)
(target-x86-32? target))
mingw-w64-i686-winpthreads)
((and (target-mingw? target)
(target-x86-64? target))
mingw-w64-x86_64-winpthreads)
((or (target-linux? target)
(target-hurd? target))
(cross-libc target))
;; We need something, and duplicating cross-binutils
;; doesn't cause any problems.
(#t (cross-binutils target))))
(prepend (cross-gcc target
#:libc (cross-libc target)))))
I don't like the '#t' branch of the cond, but it doesn't seem to break
anything. And we're explicit about who gets cross-libc.
I would like something like the following to work, but some of the
inputs get lost
(native-inputs
(modify-inputs (package-native-inputs base-rust)
(prepend
(cond ((and (target-mingw? target)
(target-x86-32? target))
(cross-gcc target
#:libc (cross-libc target))
mingw-w64-i686-winpthreads
(cross-binutils target))
((and (target-mingw? target)
(target-x86-64? target))
(cross-gcc target
#:libc (cross-libc target))
mingw-w64-x86_64-winpthreads
(cross-binutils target))
((or (target-linux? target)
(target-hurd? target))
(cross-gcc target
#:libc (cross-libc target))
(cross-libc target)
(cross-binutils target))
(else
(cross-gcc target
#:libc (cross-libc target))
(cross-binutils target))))))
--
Efraim Flashner <efraim <at> flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.