157/207: Revert "gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball."

[Jan Nieuwenhuizen]

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

commit 248d67afe7f243e847b2f552c8b4566e90e6c0b0
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Tue Aug 28 01:18:57 2018 +0200

    Revert "gnu: Add %make-static, %make-static-stripped, 
%make-bootstrap-tarball."
    
    This reverts commit 1c514faec326123fd1c45c40c74623a540e08a77.
---
 gnu/packages/make-bootstrap.scm | 55 -----------------------------------------
 1 file changed, 55 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index cb3e8d4..f7b95c8 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -41,7 +41,6 @@
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:export (%bootstrap-binaries-tarball
-            %make-bootstrap-tarball
             %linux-libre-headers-bootstrap-tarball
             %binutils-bootstrap-tarball
             %glibc-bootstrap-tarball
@@ -302,56 +301,6 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
     (license gpl3+)
     (home-page #f)))
 
-(define %make-static
-  ;; Statically-linked Make.
-  (package
-    (inherit gnu-make)
-    (name "make-static")
-    (arguments
-     `(#:strip-flags '("--strip-all")
-       #:configure-flags (cons "--without-guile"
-                               ,(match (memq #:configure-flags
-                                             (package-arguments binutils))
-                                  ((#:configure-flags flags _ ...)
-                                   flags)))
-       #:phases (modify-phases %standard-phases
-                  (add-before 'configure  'all-static
-                    (lambda _
-                      ;; The `-all-static' libtool flag can only be passed
-                      ;; after `configure', since configure tests don't use
-                      ;; libtool, and only for executables built with libtool.
-                      (substitute* '("Makefile.in")
-                        (("^LDFLAGS =(.*)$" line)
-                         (string-append line
-                                        "\nAM_LDFLAGS = -static\n"))))))))))
-
-(define %make-static-stripped
-  ;; The subset of Make that we need.
-  (package (inherit %make-static)
-    (name (string-append (package-name %make-static) "-stripped"))
-    (build-system trivial-build-system)
-    (outputs '("out"))
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-
-         (setvbuf (current-output-port) _IOLBF)
-         (let* ((in  (assoc-ref %build-inputs "make"))
-                (out (assoc-ref %outputs "out"))
-                (bin (string-append out "/bin")))
-           (mkdir-p bin)
-           (for-each (lambda (file)
-                       (let ((target (string-append bin "/" file)))
-                         (format #t "copying `~a'...~%" file)
-                         (copy-file (string-append in "/bin/" file)
-                                    target)
-                         (remove-store-references target)))
-                     '("make"))
-           #t))))
-    (inputs `(("make" ,%make-static)))))
-
 (define %linux-libre-headers-stripped
   ;; The subset of Linux-Libre-Headers that we need.
   (package (inherit linux-libre-headers)
@@ -723,10 +672,6 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
   ;; A tarball with the statically-linked bootstrap binaries.
   (tarball-package %static-binaries))
 
-(define %make-bootstrap-tarball
-  ;; A tarball with the statically-linked Make programs.
-  (tarball-package %make-static-stripped))
-
 (define %linux-libre-headers-bootstrap-tarball
   ;; A tarball with the statically-linked Linux-Libre-Headers programs.
   (tarball-package %linux-libre-headers-stripped))