[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
24/70: bootstrap: Add bzip2-mesboot.
From: |
guix-commits |
Subject: |
24/70: bootstrap: Add bzip2-mesboot. |
Date: |
Wed, 11 Dec 2019 13:03:21 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 7d154a486e61e4550000875f674c5ddd00d421b0
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sat Sep 21 22:32:18 2019 +0200
bootstrap: Add bzip2-mesboot.
* gnu/packages/commencement.scm (bzip2-mesboot): New variable.
---
gnu/packages/commencement.scm | 50 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 443b097..fdb91ea 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -806,6 +806,56 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
("tcc" ,tcc-boot0)
,@(%boot-gash-inputs)))
+(define bzip2-mesboot
+ ;; The initial bzip2
+ (package
+ (inherit bzip2)
+ (name "bzip2-mesboot")
+ (version (package-version bzip2))
+ (source (bootstrap-origin (package-source bzip2)))
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (inputs '())
+ (propagated-inputs '())
+ (native-inputs (%boot-tcc0-inputs))
+ (outputs '("out"))
+ (arguments
+ `(#:implicit-inputs? #f
+ #:guile ,%bootstrap-guile
+ #:parallel-build? #f
+ #:tests? #f ; check is naive, also checks non-built PROGRAMS
+ #:strip-binaries? #f ; no strip yet
+ #:make-flags (list "CC=tcc -I ." "AR=tcc -ar" "bzip2"
+ (string-append "PREFIX="
+ (assoc-ref %outputs "out")))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'scripted-patch
+ (lambda _
+ (substitute* "Makefile"
+ (("\tln " all)
+ (string-append "\t#" all)))
+ (substitute* "bzip2.c"
+ (("struct utimbuf uTimBuf;" all)
+ (string-append "// " all))
+ (("uTimBuf[.]" all)
+ (string-append "// " all))
+ (("retVal = utime [(] dstName, &uTimBuf [)];" all)
+ (string-append "retVal = 0; // " all)))
+ #t))
+ (replace 'configure
+ (lambda _
+ (with-output-to-file "utime.h"
+ (lambda _ (display "
+#define fchown(filedes, owner, group) 0
+#define fchmod(filedes, mode) 0
+")))
+ #t))
+ (replace 'check
+ (lambda _
+ (invoke "./bzip2" "--help")))
+ ;; FIXME: no compressing gzip yet
+ (delete 'compress-documentation))))))
+
(define tcc-boot
(package
(inherit tcc-boot0)
- 13/70: Revert "bootstrap: mescc-tools-static: Update to 0.6.1.", (continued)
- 13/70: Revert "bootstrap: mescc-tools-static: Update to 0.6.1.", guix-commits, 2019/12/11
- 14/70: Revert "bootstrap: mes-minimal: Update to mes-0.21.", guix-commits, 2019/12/11
- 18/70: bootstrap: Add %bootstrap-mes-rewired., guix-commits, 2019/12/11
- 17/70: bootstrap: Add gash-core-utils-boot., guix-commits, 2019/12/11
- 23/70: bootstrap: make-mesboot0: Use Gash instead of coreutils&co., guix-commits, 2019/12/11
- 21/70: bootstrap: tcc-boot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 28/70: bootstrap: Add patch-mesboot., guix-commits, 2019/12/11
- 16/70: bootstrap: Add gash-boot., guix-commits, 2019/12/11
- 22/70: bootstrap: Add gzip-mesboot., guix-commits, 2019/12/11
- 20/70: bootstrap: mes-boot: Install intermediate ASCII cache., guix-commits, 2019/12/11
- 24/70: bootstrap: Add bzip2-mesboot.,
guix-commits <=
- 27/70: bootstrap: diffuils-mesboot: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 26/70: bootstrap: tcc-boot: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 31/70: bootstrap: gcc-core-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 29/70: bootstrap: Add sed-mesboot0., guix-commits, 2019/12/11
- 19/70: bootstrap: mes-boot: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 25/70: bootstrap: Add bash-mesboot0., guix-commits, 2019/12/11
- 30/70: bootstrap: binutils-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 37/70: bootstrap: Add grep-mesboot., guix-commits, 2019/12/11
- 33/70: bootstrap: mesboot-headers: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 36/70: bootstrap: Add tar-mesboot., guix-commits, 2019/12/11