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

gnu: Use patched static bash in glibc replacement. 

* gnu/packages/base.scm (glibc-2.26-patched): Rename...
(glibc-2.26-patched-boot): ...to this.
(patched-static-bash, glibc-2.26-patched): New variables.
This commit is contained in:
Ricardo Wurmus 2018-03-13 22:34:43 +01:00
parent 295fbbd75d
commit 42958b5e0f
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnu/packages/base.scm
View File

@ -841,7 +841,7 @@ GLIBC/HURD for a Hurd host"
;; Below are old libc versions, which we use mostly to build locale data in
;; the old format (which the new libc cannot cope with.)
(define glibc-2.26-patched
(define glibc-2.26-patched-boot
(package
(inherit glibc)
(source (origin
@ -849,6 +849,31 @@ GLIBC/HURD for a Hurd host"
(patches (cons (search-patch "glibc-allow-kernel-2.6.32.patch")
(origin-patches (package-source glibc))))))))
(define patched-static-bash
(package
(inherit static-bash)
(arguments
(substitute-keyword-arguments (package-arguments static-bash)
((#: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-patched:static")
"/lib"))))))
(native-inputs
`(("libc-patched" ,glibc-2.26-patched-boot)
("libc-patched:static" ,glibc-2.26-patched-boot "static")))))
(define glibc-2.26-patched
(package
(inherit glibc-2.26-patched-boot)
(inputs `(("static-bash" ,patched-static-bash)
,@(alist-delete
"static-bash"
(package-inputs glibc-2.26-patched-boot))))))
(define-public glibc-2.25
(package
(inherit glibc)