nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: glibc-final: Make sure we hold just the right set of references. 

* gnu/packages/base.scm (glibc-final): Wrap in
  'package-with-restricted-references'.
This commit is contained in:
Ludovic Courtès 2014-06-07 19:36:50 +02:00
parent f986c264b2
commit 2e92375eb1
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/base.scm
View File

@ -929,12 +929,19 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define-public glibc-final (define-public 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-with-restricted-references
(name "glibc") (package (inherit glibc-final-with-bootstrap-bash)
(inputs `(("static-bash" ,static-bash-for-glibc) (name "glibc")
,@(alist-delete (inputs `(("static-bash" ,static-bash-for-glibc)
"static-bash" ,@(alist-delete
(package-inputs glibc-final-with-bootstrap-bash)))))) "static-bash"
(package-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.
(cons* gcc-boot0 (linux-libre-headers-boot0)
(package-outputs glibc-final-with-bootstrap-bash))))
(define gcc-boot0-wrapped (define gcc-boot0-wrapped
;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the