From 0fccb24765dfda3e90d7ce6981d9204f05aa6117 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 7 Mar 2018 16:57:20 +0100 Subject: gnu: commencement: 'glibc-final' now inherits from 'glibc'. * gnu/packages/commencement.scm (glibc-final): Inherit from GLIBC instead of GLIBC-FINAL-WITH-BOOTSTRAP-BASH. [propagated-inputs]: New fields. --- gnu/packages/commencement.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c38f40f618..1584f000d4 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -673,7 +673,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define glibc-final ;; The final glibc, which embeds the statically-linked Bash built above. - (package (inherit glibc-final-with-bootstrap-bash) + (package (inherit glibc) + (package + (inherit (package + (inherit glibc) + ;; Use the source patched with %BOOTSTRAP-GUILE. + (source (package-source glibc-final-with-bootstrap-bash)))) (name "glibc") (inputs `(("static-bash" ,static-bash-for-glibc) ,@(alist-delete @@ -684,6 +689,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash) ("gettext" ,gettext-boot0))) + (propagated-inputs + (package-propagated-inputs glibc-final-with-bootstrap-bash)) + ;; The final libc only refers to itself, but the 'debug' output contains ;; references to GCC-BOOT0 and to the Linux headers. XXX: Would be great ;; if 'allowed-references' were per-output. -- cgit 1.4.1