diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-03-13 22:34:43 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-03-14 11:39:14 +0100 |
| commit | 42958b5e0feff1000ba17a353bb58fdf45f20716 (patch) | |
| tree | 1604c17d728cda83830cab86ff54dbb3552d6af5 | |
| parent | 295fbbd75d753ffbb84fb78edd2d92c0275c170f (diff) | |
| download | gnu-guix-42958b5e0feff1000ba17a353bb58fdf45f20716.tar gnu-guix-42958b5e0feff1000ba17a353bb58fdf45f20716.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/base.scm | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e91f7d43ef..56f79f5801 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -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) |