janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit d4e1077ea945a215808a06276b29f79073f43dbe
Author: Jan Nieuwenhuizen <[email protected]>
Date: Tue Aug 28 10:35:32 2018 +0200
gnu: Add make-mesboot0 3.80
* gnu/packages/commencement.scm (make-mesboot0): Rename from make-mesboot.
Update users.
(make-mesboot): Build with gcc-mesboot0, binutils-mesboot0, glibc-mesboot.
(gcc-mesboot): Use it.
---
gnu/packages/commencement.scm | 52 ++++++++++++++++++++++++++++++++++++-------
1 file changed, 44 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 5c4dc9c..15b96da 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -546,11 +546,11 @@
(copy-file "libtcc1.a" (string-append out
"/lib/tcc/libtcc1.a"))))))))))))
-(define-public make-mesboot
+(define-public make-mesboot0
(package-with-bootstrap-guile
(package
(inherit gnu-make)
- (name "make-mesboot")
+ (name "make-mesboot0")
(version "3.80")
(source (origin
(method url-fetch)
@@ -627,7 +627,7 @@
("bash" ,%bootstrap-coreutils&co)
("coreutils" ,%bootstrap-coreutils&co)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(arguments
`(#:implicit-inputs? #f
#:guile ,%bootstrap-guile
@@ -676,7 +676,7 @@
("coreutils" ,%bootstrap-coreutils&co)
("diffutils" ,diffutils-mesboot)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(supported-systems '("i686-linux"))
(arguments
`(#:implicit-inputs? #f
@@ -753,7 +753,7 @@
("coreutils" ,%bootstrap-coreutils&co)
("diffutils" ,diffutils-mesboot)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(outputs '("out"))
(arguments
`(#:implicit-inputs? #f
@@ -876,7 +876,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
("coreutils" ,%bootstrap-coreutils&co)
("diffutils" ,diffutils-mesboot)
("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(outputs '("out"))
(arguments
`(#:implicit-inputs? #f
@@ -967,7 +967,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
("coreutils" ,%bootstrap-coreutils&co)
("diffutils" ,diffutils-mesboot)
("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(outputs '("out"))
(arguments
`(#:implicit-inputs? #f
@@ -1063,7 +1063,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
("coreutils" ,%bootstrap-coreutils&co)
("diffutils" ,diffutils-mesboot)
("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(arguments
`(#:implicit-inputs? #f
#:guile ,%bootstrap-guile
@@ -1127,6 +1127,42 @@ ac_cv_c_float_format='IEEE (little-endian)'
"--with-sysroot=/"
(string-append "--prefix=" out))))))))))))
+(define-public make-mesboot
+ (package-with-bootstrap-guile
+ (package
+ (inherit make-mesboot0)
+ (name "make-mesboot")
+ (supported-systems '("i686-linux"))
+ (inputs '())
+ (propagated-inputs '())
+ (native-inputs `(("binutils" ,binutils-mesboot0)
+ ("libc" ,glibc-mesboot)
+ ("gcc" ,gcc-mesboot0)
+ ("make" ,make-mesboot0)
+
+ ("bash" ,%bootstrap-coreutils&co)
+ ("coreutils" ,%bootstrap-coreutils&co)
+ ("kernel-headers" ,%bootstrap-linux-libre-headers)))
+ (arguments
+ `(#:implicit-inputs? #f
+ #:parallel-build? #f
+ #:tests? #f ; check depends on perl
+ #:guile ,%bootstrap-guile
+ #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries
+ ;;#:configure-flags '("LIBS=-lc -lnss_files -lnss_dns -lresolv")
+ #:phases
+ (modify-phases %standard-phases
+ ;; https://gcc.gnu.org/ml/gcc/1998-12/msg00083.html 2.22
+ (add-before 'configure 'setenv
+ (lambda _
+ (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv")))
+ (delete 'patch-generated-file-shebangs) ; no perl
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (install-file "make" bin))))))))))
+
(define gmp-boot
(package
(inherit gmp)
