[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
36/54: bootstrap: Add make-mesboot.
From: |
guix-commits |
Subject: |
36/54: bootstrap: Add make-mesboot. |
Date: |
Fri, 22 Nov 2019 18:17:56 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 90dd5f5f9c67edcffa6fe2644e54695653fd44fd
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Nov 22 20:52:44 2019 +0100
bootstrap: Add make-mesboot.
* gnu/packages/commencement.scm (make-mesboot): New variable.
---
gnu/packages/commencement.scm | 80 +++++++++++++++++++++++++------------------
1 file changed, 47 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index e53d969..6670909 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1643,6 +1643,53 @@ ac_cv_c_float_format='IEEE (little-endian)'
"LIBS=-lc -lnss_files -lnss_dns -lresolv"
"gl_cv_func_rename_dest_works=yes")))))
+(define make-mesboot
+ (package
+ (inherit gnu-make)
+ (name "make-mesboot")
+ (version "3.82")
+ (source (bootstrap-origin
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/make/make-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1rs2f9hmvy3q6zkl15jnlmnpgffm0bhw5ax0h5c7q604wqrip69x")))))
+ (native-inputs `(("bash" ,bash-mesboot0)
+ ("binutils" ,binutils-mesboot0)
+ ("diffutils" ,diffutils-mesboot)
+ ("gawk" ,gawk-mesboot0)
+ ("gcc" ,gcc-mesboot0)
+ ("gzip" ,gzip-mesboot0)
+ ("libc" ,glibc-mesboot0)
+ ("make" ,make-mesboot0)
+ ("sed" ,sed-mesboot0)
+ ("tar" ,tar-mesboot)
+
+ ("gash" ,%bootstrap-gash)
+ ("guile" ,%bootstrap-guile)
+ ("kernel-headers" ,%bootstrap-linux-libre-headers)))
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (inputs '())
+ (propagated-inputs '())
+ (arguments
+ `(#:implicit-inputs? #f
+ #:parallel-build? #f
+ #:guile ,%bootstrap-guile
+ #:configure-flags '("LIBS=-lc -lnss_files -lnss_dns -lresolv")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (invoke "./make" "--version")))
+ (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 binutils-mesboot
(package
(inherit binutils-mesboot0)
@@ -1666,39 +1713,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
"--host=i686-unknown-linux-gnu"
"--with-sysroot=/"))))))
-(define make-mesboot
- (package
- (inherit make-mesboot0)
- (name "make-mesboot")
- (version "3.82")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/make/make-"
- version ".tar.gz"))
- (sha256
- (base32
- "1rs2f9hmvy3q6zkl15jnlmnpgffm0bhw5ax0h5c7q604wqrip69x"))))
- (native-inputs `(("binutils" ,binutils-mesboot0)
- ("libc" ,glibc-mesboot0)
- ("gcc" ,gcc-mesboot0)
- ("make" ,make-mesboot0)
-
- ("bash" ,%bootstrap-coreutils&co)
- ("coreutils" ,%bootstrap-coreutils&co)
- ("kernel-headers" ,%bootstrap-linux-libre-headers)))
- (arguments
- (substitute-keyword-arguments (package-arguments make-mesboot0)
- ((#:configure-flags configure-flags)
- `(let ((out (assoc-ref %outputs "out")))
- `(,(string-append "--prefix=" out))))
- ((#:phases phases)
- `(modify-phases ,phases
- (delete 'configure-fixup)
- (add-before 'configure 'setenv
- (lambda _
- (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv")
- #t))))))))
-
(define gmp-boot
(package
(inherit gmp)
- 48/54: bootstrap: gcc-mesboot: Scheme-only bootstrap., (continued)
- 48/54: bootstrap: gcc-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 43/54: bootstrap: Add hello-mesboot., guix-commits, 2019/11/22
- 47/54: bootstrap: gcc-mesboot1-wrapper: Scheme-only bootstrap., guix-commits, 2019/11/22
- 46/54: bootstrap: glibc-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 37/54: bootstrap: Add gawk-mesboot., guix-commits, 2019/11/22
- 20/54: bootstrap: tcc-boot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 41/54: bootstrap: Add gcc-mesboot1: Scheme-only bootstrap., guix-commits, 2019/11/22
- 53/54: bootstrap: Add sed-boot0., guix-commits, 2019/11/22
- 50/54: bootstrap: Add coreutils-mesboot., guix-commits, 2019/11/22
- 54/54: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash., guix-commits, 2019/11/22
- 36/54: bootstrap: Add make-mesboot.,
guix-commits <=
- 44/54: bootstrap: binutils-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 25/54: bootstrap: gcc-core-mesboot0: Scheme-only bootstrap., guix-commits, 2019/11/22
- 29/54: bootstrap: mesboot-headers: Scheme-only bootstrap., guix-commits, 2019/11/22
- 34/54: bootstrap: Add binutils-mesboot1., guix-commits, 2019/11/22
- 35/54: bootstrap: Add coreutils-mesboot0., guix-commits, 2019/11/22
- 45/54: bootstrap: glibc-headers-mesboot: Scheme-only bootstrap., guix-commits, 2019/11/22
- 39/54: bootstrap: Add gcc-core-mesboot1., guix-commits, 2019/11/22
- 51/54: bootstrap: Remove m4-bootstrap., guix-commits, 2019/11/22
- 52/54: bootstrap: %bootstrap-inputs+toolchain: Scheme-only bootstrap., guix-commits, 2019/11/22