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.
This commit is contained in:
parent
021caafa2c
commit
0fccb24765
|
@ -673,7 +673,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
|
||||||
|
|
||||||
(define glibc-final
|
(define glibc-final
|
||||||
;; The final glibc, which embeds the statically-linked Bash built above.
|
;; 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")
|
(name "glibc")
|
||||||
(inputs `(("static-bash" ,static-bash-for-glibc)
|
(inputs `(("static-bash" ,static-bash-for-glibc)
|
||||||
,@(alist-delete
|
,@(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)
|
(native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash)
|
||||||
("gettext" ,gettext-boot0)))
|
("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
|
;; 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
|
;; references to GCC-BOOT0 and to the Linux headers. XXX: Would be great
|
||||||
;; if 'allowed-references' were per-output.
|
;; if 'allowed-references' were per-output.
|
||||||
|
|
Loading…
Reference in New Issue