janneke pushed a commit to branch wip-bootstrap in repository guix. commit cada56165dab632b66ae8af1248340dea7ae61c7 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Tue Aug 28 01:14:28 2018 +0200
Revert "gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball." This reverts commit f7234aef5c3cb38b3ccd6c287be3fad57ddc9d25. --- gnu/packages/make-bootstrap.scm | 52 ----------------------------------------- 1 file changed, 52 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 2062f86..cb3e8d4 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 - %diffutils-bootstrap-tarball %make-bootstrap-tarball %linux-libre-headers-bootstrap-tarball %binutils-bootstrap-tarball @@ -303,53 +302,6 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (license gpl3+) (home-page #f))) -(define %diffutils-static - ;; Statically-linked Diffutils. - (package - (inherit diffutils) - (name "diffutils-static") - (arguments - `(#:strip-flags '("--strip-all") - #:make-flags '("V=2") - #: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" - "src/Makefile.in") - (("^LDFLAGS =(.*)$" line) - (string-append line - "\nAM_LDFLAGS = -static\n")))))))))) - -(define %diffutils-static-stripped - ;; The subset of Diffutils that we need. - (package (inherit %diffutils-static) - (name (string-append (package-name %diffutils-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 "diffutils")) - (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))) - '("cmp" "diff")) - #t)))) - (inputs `(("diffutils" ,%diffutils-static))))) - (define %make-static ;; Statically-linked Make. (package @@ -771,10 +723,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 %diffutils-bootstrap-tarball - ;; A tarball with the statically-linked Diffutils programs. - (tarball-package %diffutils-static-stripped)) - (define %make-bootstrap-tarball ;; A tarball with the statically-linked Make programs. (tarball-package %make-static-stripped))