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

gnu: glibc-final: Remove top-level circular dependency. 

This fixes a top-level circular dependency between linux.scm and
base.scm introduced in 2e92375.

* gnu/packages/base.scm (glibc-final): Remove call to
  'package-with-restricted-references', and use an 'arguments' field
  instead.
This commit is contained in:
Ludovic Courtès 2014-06-08 23:24:04 +02:00
parent 3916023228
commit e0a0c84b4f
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnu/packages/base.scm
View File

@ -929,19 +929,22 @@ 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-with-restricted-references (package (inherit glibc-final-with-bootstrap-bash)
(package (inherit 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 "static-bash"
"static-bash" (package-inputs glibc-final-with-bootstrap-bash))))
(package-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.
(cons* gcc-boot0 (linux-libre-headers-boot0) (arguments
(package-outputs glibc-final-with-bootstrap-bash)))) `(#:allowed-references
,(cons* gcc-boot0 (linux-libre-headers-boot0)
(package-outputs glibc-final-with-bootstrap-bash))
,@(package-arguments 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