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

Revert "gnu: Add replacement for static-bash-for-glibc." 

This reverts commit c4fb2b9f4e.
This commit is contained in:
Ricardo Wurmus 2018-03-14 16:26:24 +01:00
parent 9c9912cf5b
commit 48b97be90b
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gnu/packages/commencement.scm
View File

@ -556,14 +556,6 @@ the bootstrap environment."
;; because we don't want to depend on bootstrap tools. ;; because we don't want to depend on bootstrap tools.
("static-bash" ,@(assoc-ref %boot0-inputs "bash"))))))) ("static-bash" ,@(assoc-ref %boot0-inputs "bash")))))))
(define patched-glibc-final-with-bootstrap-bash
(package
(inherit glibc-final-with-bootstrap-bash)
(source (origin
(inherit (package-source glibc-final-with-bootstrap-bash))
(patches (cons (search-patch "glibc-allow-kernel-2.6.32.patch")
(origin-patches (package-source glibc-final-with-bootstrap-bash))))))))
(define (cross-gcc-wrapper gcc binutils glibc bash) (define (cross-gcc-wrapper gcc binutils glibc bash)
"Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC
that makes it available under the native tool names." that makes it available under the native tool names."
@ -640,40 +632,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
("libc:static" ,glibc-final-with-bootstrap-bash "static") ("libc:static" ,glibc-final-with-bootstrap-bash "static")
,@(fold alist-delete %boot1-inputs ,@(fold alist-delete %boot1-inputs
'("gcc" "libc"))))) '("gcc" "libc")))))
(let ((p (package-with-bootstrap-guile
(package-with-explicit-inputs bash inputs
(current-source-location)
#:guile %bootstrap-guile))))
(package (inherit p)
(replacement patched-static-bash-for-glibc)))))
;; Same as static-bash-for-glibc, except that it uses a patched glibc for the
;; "gcc" and "bash" packages.
(define patched-static-bash-for-glibc
;; A statically-linked Bash to be used by GLIBC-FINAL in system(3) & co.
(let* ((gcc (cross-gcc-wrapper gcc-boot0 binutils-boot0
patched-glibc-final-with-bootstrap-bash
(car (assoc-ref %boot1-inputs "bash"))))
(bash (package
(inherit static-bash)
(arguments
(substitute-keyword-arguments
(package-arguments static-bash)
((#:guile _ #f)
'%bootstrap-guile)
((#:configure-flags flags '())
;; Add a '-L' flag so that the pseudo-cross-ld of
;; BINUTILS-BOOT0 can find libc.a.
`(append ,flags
(list (string-append "LDFLAGS=-static -L"
(assoc-ref %build-inputs
"libc:static")
"/lib"))))))))
(inputs `(("gcc" ,gcc)
("libc" ,patched-glibc-final-with-bootstrap-bash)
("libc:static" ,patched-glibc-final-with-bootstrap-bash "static")
,@(fold alist-delete %boot1-inputs
'("gcc" "libc")))))
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package-with-explicit-inputs bash inputs (package-with-explicit-inputs bash inputs
(current-source-location) (current-source-location)