civodul pushed a commit to branch core-updates
in repository guix.
commit 4610ab7c9a5327df0d475262817bc081a5891aa8
Author: Ludovic Courtès <[email protected]>
Date: Wed Jan 10 10:02:44 2018 +0100
gnu: make-bootstrap: Add libc:static to the inputs.
Fixes use of 'getpwnam' & co. from the statically-linked guile in the
initrd, as reported by Leo Famulari <[email protected]> at
<https://lists.gnu.org/archive/html/guix-devel/2018-01/msg00061.html>.
* gnu/packages/make-bootstrap.scm
(package-with-relocatable-glibc)[native-inputs]:
Add "libc:static".
---
gnu/packages/make-bootstrap.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 4b81f73..07ac936 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès
<[email protected]>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<[email protected]>
;;; Copyright © 2017 Efraim Flashner <[email protected]>
;;;
;;; This file is part of GNU Guix.
@@ -104,10 +104,12 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
("cross-binutils" ,(cross-binutils target))
,@(%final-inputs)))
`(("libc" ,(glibc-for-bootstrap))
+ ("libc:static" ,(glibc-for-bootstrap) "static")
("gcc" ,(package (inherit gcc)
(outputs '("out")) ; all in one so libgcc_s is easily found
(inputs
`(("libc",(glibc-for-bootstrap))
+ ("libc:static" ,(glibc-for-bootstrap) "static")
,@(package-inputs gcc)))))
,@(fold alist-delete (%final-inputs) '("libc" "gcc")))))
