[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/70: bootstrap: make-mesboot0: Use Gash instead of coreutils&co.
From: |
guix-commits |
Subject: |
23/70: bootstrap: make-mesboot0: Use Gash instead of coreutils&co. |
Date: |
Wed, 11 Dec 2019 13:03:21 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 87a8782f43f2e849b0476dc786e025a1c681905d
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sat Sep 21 13:34:42 2019 +0200
bootstrap: make-mesboot0: Use Gash instead of coreutils&co.
* gnu/packages/commencement.scm (make-mesboot0): Use Gash instead of
coreutils&co.
(%boot-tcc0-inputs): New variable.
---
gnu/packages/commencement.scm | 108 ++++++++++++++++++++++++------------------
1 file changed, 61 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 3f88e34..443b097 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -745,6 +745,67 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
;; no gzip yet
(delete 'compress-documentation))))))
+(define make-mesboot0
+ ;; The initial make
+ (package
+ (inherit gnu-make)
+ (name "make-mesboot0")
+ (version "3.80")
+ (source (bootstrap-origin
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/make/make-" version
".tar.gz"))
+ (sha256
+ (base32
+ "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4")))))
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (inputs '())
+ (propagated-inputs '())
+ (native-inputs `(("tcc" ,tcc-boot0)
+ ,@(%boot-gash-inputs)))
+ (arguments
+ `(#:implicit-inputs? #f
+ #:guile ,%bootstrap-guile
+ #:configure-flags '("CC=tcc"
+ "CPP=tcc -E"
+ "LD=tcc"
+ "--build=i686-unknown-linux-gnu"
+ "--host=i686-unknown-linux-gnu"
+ "--disable-nls")
+ #:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-1))
+ #:strip-binaries? #f ; no strip yet
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'scripted-patch
+ (lambda _
+ (substitute* "build.sh.in"
+ (("@LIBOBJS@") "getloadavg.o")
+ (("@REMOTE@") "stub"))
+ #t))
+ (add-after 'configure 'configure-fixup
+ (lambda _
+ (substitute* "make.h"
+ (("^extern long int lseek.*" all) (string-append "// " all)))
+ #t))
+ (replace 'build
+ (lambda _
+ (invoke "sh" "./build.sh")))
+ (replace 'check ; proper check needs awk
+ (lambda _
+ (invoke "./make" "--version")))
+ (replace 'install
+ (lambda _
+ (let* ((out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin")))
+ (install-file "make" bin)))))))))
+
+(define (%boot-tcc0-inputs)
+ `(("make" ,make-mesboot0)
+ ("tcc" ,tcc-boot0)
+ ,@(%boot-gash-inputs)))
+
(define tcc-boot
(package
(inherit tcc-boot0)
@@ -846,53 +907,6 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
(copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a"))
#t))))))))
-(define make-mesboot0
- (package
- (inherit gnu-make)
- (name "make-mesboot0")
- (version "3.80")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/make/make-"
- version ".tar.gz"))
- (sha256
- (base32
- "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4"))))
- (supported-systems '("i686-linux" "x86_64-linux"))
- (inputs '())
- (propagated-inputs '())
- (native-inputs `(("tcc" ,tcc-boot)
-
- ("bash" ,%bootstrap-coreutils&co)
- ("coreutils" ,%bootstrap-coreutils&co)))
- (arguments
- `(#:implicit-inputs? #f
- #:tests? #f ; check depends on perl
- #:guile ,%bootstrap-guile
- #:configure-flags `("CC=tcc -DO_RDONLY=0"
- "LD=tcc"
- "--disable-nls")
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'configure-fixup
- (lambda _
- (substitute* "build.sh"
- (("^REMOTE=.*") "REMOTE=stub\n")
- (("^extras=.*") "extras=getloadavg.c\n"))
- (substitute* "make.h"
- (("^extern long int lseek.*" all) (string-append "// " all)))
- #t))
- (delete 'patch-generated-file-shebangs) ; no perl
- (replace 'build
- (lambda _
- (invoke "sh" "./build.sh")))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (install-file "make" bin)
- #t))))))))
-
(define diffutils-mesboot
(package
(inherit diffutils)
- 09/70: bootstrap: bootstrap-mes: Update to mes-0.21., (continued)
- 09/70: bootstrap: bootstrap-mes: Update to mes-0.21., guix-commits, 2019/12/11
- 10/70: Revert "bootstrap: bootstrap-mes: Update to mes-0.21.", guix-commits, 2019/12/11
- 11/70: Revert "bootstrap: bootstrap-mescc-tools: Update to mescc-tools-0.6.1.", guix-commits, 2019/12/11
- 15/70: bootstrap: Add %bootstrap-guile+guild., guix-commits, 2019/12/11
- 12/70: Revert "gnu: Remove mescc-tools-0.5.2.", guix-commits, 2019/12/11
- 06/70: bootstrap: mes-minimal: Update to mes-0.21., guix-commits, 2019/12/11
- 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 <=
- 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, 2019/12/11
- 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