03/03: Revert "gnu: Use patched static bash in glibc replacement."

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 441010a2d1f77b15f9becfac622e9b1d76b7b1fd
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Mar 14 16:26:24 2018 +0100

    Revert "gnu: Use patched static bash in glibc replacement."
    
    This reverts commit 42958b5e0feff1000ba17a353bb58fdf45f20716.
---
 gnu/packages/base.scm | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 56f79f5..e91f7d4 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-boot
+(define glibc-2.26-patched
   (package
     (inherit glibc)
     (source (origin
@@ -849,31 +849,6 @@ 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)