[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
155/163: Revert "gnu: Add %diffutils-static, %diffutils-static-stripped,
From: |
Jan Nieuwenhuizen |
Subject: |
155/163: Revert "gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball." |
Date: |
Thu, 30 Aug 2018 01:03:41 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit ed36a53fb8fdd0f7948e46e7ef552e41a3cdccd4
Author: Jan Nieuwenhuizen <address@hidden>
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))
- 116/163: gnu: gcc-mesboot0: Package with bootstrap-guile., (continued)
- 116/163: gnu: gcc-mesboot0: Package with bootstrap-guile., Jan Nieuwenhuizen, 2018/08/30
- 126/163: gnu: gcc-mesboot0: Revise dependencies., Jan Nieuwenhuizen, 2018/08/30
- 127/163: gnu: binutils-mesboot: Revise dependencies., Jan Nieuwenhuizen, 2018/08/30
- 129/163: gnu: %mes-seed: Update for mes 0.17., Jan Nieuwenhuizen, 2018/08/30
- 130/163: gnu: %tinycc-seed: Update for mes 0.17., Jan Nieuwenhuizen, 2018/08/30
- 132/163: gnu: tcc-boot0: Update for mes 0.17., Jan Nieuwenhuizen, 2018/08/30
- 137/163: gnu: tcc-boot: Use gnu-build-system., Jan Nieuwenhuizen, 2018/08/30
- 138/163: gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball., Jan Nieuwenhuizen, 2018/08/30
- 144/163: gnu: bootstrap-tarballs: Update inputs for i686-linux., Jan Nieuwenhuizen, 2018/08/30
- 147/163: gnu: %tinycc-seed: Update for mes 0.18. WIP, Jan Nieuwenhuizen, 2018/08/30
- 155/163: Revert "gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball.",
Jan Nieuwenhuizen <=
- 112/163: gnu: tcc-boot: Package with bootstrap-guile., Jan Nieuwenhuizen, 2018/08/30
- 134/163: gnu: mescc-tools-boot: Use gnu-build-system., Jan Nieuwenhuizen, 2018/08/30
- 149/163: gnu: tcc-boot: Update for mes 0.18. WIP, Jan Nieuwenhuizen, 2018/08/30
- 151/163: gnu: Add diffutils-mesboot 2.7., Jan Nieuwenhuizen, 2018/08/30
- 159/163: gcc-mesboot: use package-full-name "-" :-), Jan Nieuwenhuizen, 2018/08/30
- 157/163: Revert "gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball.", Jan Nieuwenhuizen, 2018/08/30
- 153/163: bootstrap: Remove dependency on %bootstrap-make, %bootstrap-diffutils., Jan Nieuwenhuizen, 2018/08/30
- 161/163: gnu: make-boot0: Set LOADLIBES for i686-linux., Jan Nieuwenhuizen, 2018/08/30
- 145/163: bootstrap: Integrate mes bootstrap for i686-linux., Jan Nieuwenhuizen, 2018/08/30
- 65/163: gnu: binutils-boot: Update to 2.25., Jan Nieuwenhuizen, 2018/08/30