[PATCH 2/2] gnu: %guile-static-3.0: New variable.

  • Done
  • quality assurance status badge
Details
One participant
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Maxim Cournoyer
Severity
normal
Merged with
M
M
Maxim Cournoyer wrote on 14 Dec 2022 21:12
(address . guix-patches@gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20221214201256.13459-2-maxim.cournoyer@gmail.com
* gnu/packages/make-bootstrap.scm (%guile-static-3.0): New variable.
(%guile-static-stripped): Use it.
---
gnu/packages/make-bootstrap.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

Toggle diff (32 lines)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 24855f6b28..a0999cb477 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -748,6 +748,12 @@ (define %guile-static
"guile-default-utf8.patch"
"guile-linux-syscalls.patch")))
+(define %guile-static-3.0
+ (make-guile-static guile-3.0-latest
+ '("guile-2.2-default-utf8.patch"
+ "guile-3.0-linux-syscalls.patch"
+ "guile-3.0-relocatable.patch")))
+
(define* (make-guile-static-stripped static-guile)
(package
(inherit static-guile)
@@ -796,11 +802,7 @@ (define* (make-guile-static-stripped static-guile)
(define %guile-static-stripped
;; A stripped static Guile 3.0 binary, for use in initrds
;; and during bootstrap.
- (make-guile-static-stripped
- (make-guile-static guile-3.0-latest
- '("guile-2.2-default-utf8.patch"
- "guile-3.0-linux-syscalls.patch"
- "guile-3.0-relocatable.patch"))))
+ (make-guile-static-stripped %guile-static-3.0))
(define (tarball-package pkg)
"Return a package containing a tarball of PKG."
--
2.38.1
M
M
Maxim Cournoyer wrote on 14 Dec 2022 21:47
control message for bug #60071
(address . control@debbugs.gnu.org)
87bko53e6x.fsf@gmail.com
forcemerge 60071 60072
quit
M
M
Maxim Cournoyer wrote on 3 Jan 2023 22:20
Re: bug#60072: [PATCH 2/2] gnu: %guile-static-3.0: New variable.
(address . 60071-done@debbugs.gnu.org)(address . 60072-done@debbugs.gnu.org)
87h6x71fjp.fsf@gmail.com
Hello,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

Toggle quote (5 lines)
> * gnu/packages/make-bootstrap.scm (%guile-static-stripped): Use
> guile-3.0-latest, currently at 3.0.8. This resolves a segfault in the Guix
> System Linux initrd when running Guile 3.0.7 on a Cortex A9 CPU (NXP i.MX6
> Quad).

Applied, closing.

--
Thanks,
Maxim
Closed
?