206/210: gnu: m4-boot0: New variable.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 9556f558bcaab748d9c074d90c1d1c8e2342a7e4
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sat Sep 8 12:58:57 2018 +0200

    gnu: m4-boot0: New variable.
    
    This fixes the bootstrap leaks in m4 declared as part of bison-boot0.
    
    * gnu/packages/commencement.scm (m4-boot0): New variable.
---
 gnu/packages/commencement.scm | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 80e8684..964682a 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1923,25 +1923,32 @@ exec " gcc "/bin/" program
      (propagated-inputs '())
      (native-inputs '()))))
 
+(define m4-boot0
+  (package-with-bootstrap-guile
+   (package
+     (inherit m4)
+     (name "m4-boot0")
+     (inputs (%boot0-inputs))
+     (arguments
+      `(#:guile ,%bootstrap-guile
+        #:implicit-inputs? #f
+        ,@(package-arguments m4))))))
+
 (define bison-boot0
   ;; This Bison is needed to build MiG so we need it early in the process.
   ;; It is also needed to rebuild Bash's parser, which is modified by
   ;; its CVE patches.  Remove it when it's no longer needed.
-  (let* ((m4    (package-with-bootstrap-guile
-                 (package-with-explicit-inputs m4 (%boot0-inputs)
-                                               (current-source-location)
-                                               #:guile %bootstrap-guile)))
-         (bison (package (inherit bison)
-                  (propagated-inputs `(("m4" ,m4)))
-                  (inputs '())                    ;remove Flex...
-                  (arguments
-                   '(#:tests? #f                  ;... and thus disable tests
-
-                     ;; Zero timestamps in liby.a; this must be done
-                     ;; explicitly here because the bootstrap Binutils don't
-                     ;; do that (default is "cru".)
-                     #:make-flags '("ARFLAGS=crD" "RANLIB=ranlib -D"
-                                    "V=1"))))))
+  (let ((bison (package (inherit bison)
+                        (propagated-inputs `(("m4" ,m4-boot0)))
+                        (inputs '())    ;remove Flex...
+                        (arguments
+                         '(#:tests? #f  ;... and thus disable tests
+
+                           ;; Zero timestamps in liby.a; this must be done
+                           ;; explicitly here because the bootstrap Binutils 
don't
+                           ;; do that (default is "cru".)
+                           #:make-flags '("ARFLAGS=crD" "RANLIB=ranlib -D"
+                                          "V=1"))))))
     (package
       (inherit (package-with-bootstrap-guile
                 (package-with-explicit-inputs bison (%boot0-inputs)