[parent not found: <20200425174500.B268120A5E@vcs0.savannah.gnu.org>]
* Re: 04/42: gnu: guix: Cross-build workaround: Run native guile for version.
[not found] ` <20200425174500.B268120A5E@vcs0.savannah.gnu.org>
@ 2020-04-26 16:12 ` Ludovic Courtès
2020-04-26 19:09 ` Jan Nieuwenhuizen
0 siblings, 1 reply; 9+ messages in thread
From: Ludovic Courtès @ 2020-04-26 16:12 UTC (permalink / raw)
To: guix-devel
guix-commits@gnu.org skribis:
> commit 4c7c89f97a0d49bc678251bf3ab452dcab85522a
> Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
> AuthorDate: Fri Apr 24 11:21:48 2020 +0200
>
> gnu: guix: Cross-build workaround: Run native guile for version.
>
> We need to take some care here, the native guile is not necessarily always the
> same version as the host guile.
>
> * gnu/packages/package-management.scm (guix)[arguments]: Do not attempt to run
> host guile for getting effective-version; resort to native guile.
Good catch, LGTM!
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <20200425174501.8CF2620A5E@vcs0.savannah.gnu.org>]
* Re: 07/42: gnu: guix: Cross-build fix: override compressors.
[not found] ` <20200425174501.8CF2620A5E@vcs0.savannah.gnu.org>
@ 2020-04-26 16:15 ` Ludovic Courtès
2020-04-26 19:10 ` Jan Nieuwenhuizen
2020-04-26 19:10 ` Jan Nieuwenhuizen
0 siblings, 2 replies; 9+ messages in thread
From: Ludovic Courtès @ 2020-04-26 16:15 UTC (permalink / raw)
To: guix-devel
guix-commits@gnu.org skribis:
> commit eeb87326d891e0f88f5eebf767d97b45c3e6bbbb
> Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
> AuthorDate: Fri Apr 10 21:24:19 2020 +0200
>
> gnu: guix: Cross-build fix: override compressors.
>
> * gnu/packages/package-management.scm (guix)[arguments]: When cross-compiling,
> add `fixup-compressors' stage.
> [inputs]: When cross-compiling, add `xz'.
Nice!
> + (lambda* (#:key inputs #:allow-other-keys)
> + ;; Use host compressors.
> + (let ((bzip2 (assoc-ref inputs "bzip2"))
> + (gzip (assoc-ref inputs "gzip"))
> + (xz (assoc-ref inputs "xz")))
> + (substitute* "guix/config.scm"
> + (("/gnu/store/.*/bzip2")
> + (string-append bzip2 "/bin/bzip2"))
> + (("/gnu/store/.*/gzip") gzip
> + (string-append gzip "/bin/gzip"))
> + (("/gnu/store/.*/xz")
> + (string-append xz "/bin/xz")))
Here’s a way to avoid hard-coding the store name:
(substitute* "guix/config.scm"
(("\".*/bin/gzip\"")
(string-append "\"" gzip "/bin/gzip\""))
…)
Otherwise LGTM!
Perhaps eventually we should add ‘--with-host-gzip’ and similar
configure options.
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: 07/42: gnu: guix: Cross-build fix: override compressors.
2020-04-26 16:15 ` 07/42: gnu: guix: Cross-build fix: override compressors Ludovic Courtès
@ 2020-04-26 19:10 ` Jan Nieuwenhuizen
2020-04-26 19:10 ` Jan Nieuwenhuizen
1 sibling, 0 replies; 9+ messages in thread
From: Jan Nieuwenhuizen @ 2020-04-26 19:10 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Ludovic Courtès writes:
> guix-commits@gnu.org skribis:
>
>> commit eeb87326d891e0f88f5eebf767d97b45c3e6bbbb
>> Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
>> AuthorDate: Fri Apr 10 21:24:19 2020 +0200
>>
>> gnu: guix: Cross-build fix: override compressors.
>>
>> * gnu/packages/package-management.scm (guix)[arguments]: When cross-compiling,
>> add `fixup-compressors' stage.
>> [inputs]: When cross-compiling, add `xz'.
>
> Nice!
>
>> + (lambda* (#:key inputs #:allow-other-keys)
>> + ;; Use host compressors.
>> + (let ((bzip2 (assoc-ref inputs "bzip2"))
>> + (gzip (assoc-ref inputs "gzip"))
>> + (xz (assoc-ref inputs "xz")))
>> + (substitute* "guix/config.scm"
>> + (("/gnu/store/.*/bzip2")
>> + (string-append bzip2 "/bin/bzip2"))
>> + (("/gnu/store/.*/gzip") gzip
>> + (string-append gzip "/bin/gzip"))
>> + (("/gnu/store/.*/xz")
>> + (string-append xz "/bin/xz")))
>
> Here’s a way to avoid hard-coding the store name:
>
> (substitute* "guix/config.scm"
> (("\".*/bin/gzip\"")
> (string-append "\"" gzip "/bin/gzip\""))
> …)
Ah, nice. Change them to
(("\"[^\"]*/bin/bzip2")
(string-append "\"" bzip2 "/bin/bzip2"))
> Otherwise LGTM!
Thanks!
> Perhaps eventually we should add ‘--with-host-gzip’ and similar
> configure options.
Okay, I'll give that a go later.
janneke
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: 07/42: gnu: guix: Cross-build fix: override compressors.
2020-04-26 16:15 ` 07/42: gnu: guix: Cross-build fix: override compressors Ludovic Courtès
2020-04-26 19:10 ` Jan Nieuwenhuizen
@ 2020-04-26 19:10 ` Jan Nieuwenhuizen
1 sibling, 0 replies; 9+ messages in thread
From: Jan Nieuwenhuizen @ 2020-04-26 19:10 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Ludovic Courtès writes:
> guix-commits@gnu.org skribis:
>
>> commit eeb87326d891e0f88f5eebf767d97b45c3e6bbbb
>> Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
>> AuthorDate: Fri Apr 10 21:24:19 2020 +0200
>>
>> gnu: guix: Cross-build fix: override compressors.
>>
>> * gnu/packages/package-management.scm (guix)[arguments]: When cross-compiling,
>> add `fixup-compressors' stage.
>> [inputs]: When cross-compiling, add `xz'.
>
> Nice!
>
>> + (lambda* (#:key inputs #:allow-other-keys)
>> + ;; Use host compressors.
>> + (let ((bzip2 (assoc-ref inputs "bzip2"))
>> + (gzip (assoc-ref inputs "gzip"))
>> + (xz (assoc-ref inputs "xz")))
>> + (substitute* "guix/config.scm"
>> + (("/gnu/store/.*/bzip2")
>> + (string-append bzip2 "/bin/bzip2"))
>> + (("/gnu/store/.*/gzip") gzip
>> + (string-append gzip "/bin/gzip"))
>> + (("/gnu/store/.*/xz")
>> + (string-append xz "/bin/xz")))
>
> Here’s a way to avoid hard-coding the store name:
>
> (substitute* "guix/config.scm"
> (("\".*/bin/gzip\"")
> (string-append "\"" gzip "/bin/gzip\""))
> …)
Ah, nice. Change them to
(("\"[^\"]*/bin/bzip2")
(string-append "\"" bzip2 "/bin/bzip2"))
> Otherwise LGTM!
Thanks!
> Perhaps eventually we should add ‘--with-host-gzip’ and similar
> configure options.
Okay, I'll give that a go later.
janneke
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <20200425174503.85FCE20A5E@vcs0.savannah.gnu.org>]
end of thread, other threads:[~2020-04-26 19:12 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20200425174447.10575.48360@vcs0.savannah.gnu.org>
[not found] ` <20200425174501.C9B1A20A5E@vcs0.savannah.gnu.org>
2020-04-26 16:11 ` 08/42: gnu: guix: Update to eeb87326d8 Ludovic Courtès
2020-04-26 19:12 ` Jan Nieuwenhuizen
[not found] ` <20200425174500.B268120A5E@vcs0.savannah.gnu.org>
2020-04-26 16:12 ` 04/42: gnu: guix: Cross-build workaround: Run native guile for version Ludovic Courtès
2020-04-26 19:09 ` Jan Nieuwenhuizen
[not found] ` <20200425174501.8CF2620A5E@vcs0.savannah.gnu.org>
2020-04-26 16:15 ` 07/42: gnu: guix: Cross-build fix: override compressors Ludovic Courtès
2020-04-26 19:10 ` Jan Nieuwenhuizen
2020-04-26 19:10 ` Jan Nieuwenhuizen
[not found] ` <20200425174503.85FCE20A5E@vcs0.savannah.gnu.org>
2020-04-26 16:16 ` 14/42: gnu: Add netdde Ludovic Courtès
2020-04-26 19:12 ` Jan Nieuwenhuizen
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).