[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
140/192: gnu: Add %diffutils-static, %diffutils-static-stripped, %diffut
From: |
Jan Nieuwenhuizen |
Subject: |
140/192: gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball. |
Date: |
Mon, 3 Sep 2018 16:25:13 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8683d1740e8469d0bb2978522288f26e36d14f39
Author: Jan Nieuwenhuizen <address@hidden>
Date: Thu Aug 23 22:52:29 2018 +0200
gnu: Add %diffutils-static, %diffutils-static-stripped,
%diffutils-bootstrap-tarball.
* gnu/packages/make-bootstrap.scm (%diffutils-static,
%diffutils-static-stripped, %diffutils-bootstrap-tarball): New variable.
---
gnu/packages/make-bootstrap.scm | 52 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index efef713..a84cfb3 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -41,6 +41,7 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:export (%bootstrap-binaries-tarball
+ %diffutils-bootstrap-tarball
%make-bootstrap-tarball
%binutils-bootstrap-tarball
%glibc-bootstrap-tarball
@@ -301,6 +302,53 @@ 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
@@ -702,6 +750,10 @@ 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))
- 141/192: gnu: Add %bootstrap-diffutils., (continued)
- 141/192: gnu: Add %bootstrap-diffutils., Jan Nieuwenhuizen, 2018/09/03
- 156/192: Revert "gnu: Add %bootstrap-make.", Jan Nieuwenhuizen, 2018/09/03
- 127/192: gnu: binutils-mesboot: Revise dependencies., Jan Nieuwenhuizen, 2018/09/03
- 147/192: gnu: %tinycc-seed: Update for mes 0.17.1., Jan Nieuwenhuizen, 2018/09/03
- 144/192: gnu: bootstrap-tarballs: Update inputs for i686-linux., Jan Nieuwenhuizen, 2018/09/03
- 159/192: gcc-mesboot: use package-full-name "-" :-), Jan Nieuwenhuizen, 2018/09/03
- 170/192: gnu: make-mesboot: Update to 3.82., Jan Nieuwenhuizen, 2018/09/03
- 166/192: gnu: file-boot0: Do not strip binaries or validate-runpath., Jan Nieuwenhuizen, 2018/09/03
- 169/192: bootstrap: Evaluate %bootstrap-inputs+toolchain at build time., Jan Nieuwenhuizen, 2018/09/03
- 181/192: gnu: diffutils-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 140/192: gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball.,
Jan Nieuwenhuizen <=
- 149/192: gnu: tcc-boot: Update for mes 0.17.1., Jan Nieuwenhuizen, 2018/09/03
- 143/192: gnu: Add %bootstrap-linux-libre-headers., Jan Nieuwenhuizen, 2018/09/03
- 155/192: Revert "gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball.", Jan Nieuwenhuizen, 2018/09/03
- 165/192: Revert "gnu: make-boot0: Set LOADLIBES for i686-linux.", Jan Nieuwenhuizen, 2018/09/03
- 168/192: gnu: gcc-mesboot-wrapper: Wrap g++ too., Jan Nieuwenhuizen, 2018/09/03
- 172/192: copy-linux-headers: Update for glibc-2.16.0., Jan Nieuwenhuizen, 2018/09/03
- 171/192: %bootstrap-linux-libre-headers: Update, Jan Nieuwenhuizen, 2018/09/03
- 178/192: gnu: tcc-boot0: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 120/192: gnu: mes-boot: Update to 0.16.1; revise dependencies., Jan Nieuwenhuizen, 2018/09/03
- 118/192: gnu: mescc-tools-boot: Revise dependencies., Jan Nieuwenhuizen, 2018/09/03