[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
180/192: gnu: make-mesboot0: Cleanup.
From: |
Jan Nieuwenhuizen |
Subject: |
180/192: gnu: make-mesboot0: Cleanup. |
Date: |
Mon, 3 Sep 2018 16:25:23 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 43c84aadfc9da0b6672e377b2f15d58405f5b068
Author: Jan Nieuwenhuizen <address@hidden>
Date: Mon Sep 3 11:03:03 2018 +0200
gnu: make-mesboot0: Cleanup.
* gnu/packages/commencement.scm (make-mesboot0): Cleanup.
---
gnu/packages/commencement.scm | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 8188333..2e06e20 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -586,24 +586,11 @@
`(#:implicit-inputs? #f
#:tests? #f ; check depends on perl
#:guile ,%bootstrap-guile
- #:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries
+ #:configure-flags `("CC=tcc -DO_RDONLY=0"
+ "LD=tcc"
+ "--disable-nls")
#:phases
(modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (unsetenv "C_INCLUDE_PATH")
- (unsetenv "LIBRARY_PATH")
- (setenv "CONFIG_SHELL" (string-append
- (assoc-ref %build-inputs "bash")
- "/bin/sh"))
- (setenv "CC" "tcc -g -static -DO_RDONLY=0")
- (setenv "LD" "tcc -g -static")
- (format (current-error-port) "PATH=~a\n" (getenv "PATH"))
- (zero?
- (system* "./configure"
- (string-append "--prefix=" out)
- "--disable-nls")))))
(add-after 'configure 'configure-fixup
(lambda _
(substitute* "build.sh"
@@ -615,7 +602,7 @@
(delete 'patch-generated-file-shebangs) ; no perl
(replace 'build
(lambda _
- (zero? (system* "sh" "./build.sh"))))
+ (invoke "sh" "./build.sh")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- 157/192: Revert "gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball.", (continued)
- 157/192: Revert "gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball.", Jan Nieuwenhuizen, 2018/09/03
- 161/192: gnu: make-boot0: Set LOADLIBES for i686-linux., Jan Nieuwenhuizen, 2018/09/03
- 163/192: Add new cheat: use %bootstrap-glibc for x86 for now., Jan Nieuwenhuizen, 2018/09/03
- 182/192: gnu: binutils-mesboot0: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 164/192: gnu: Add gcc-mesboot-wrapper 4.7.4., Jan Nieuwenhuizen, 2018/09/03
- 167/192: gnu: gcc-mesboot: Enable c++ too., Jan Nieuwenhuizen, 2018/09/03
- 176/192: mescc-tools-boot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 175/192: gnu: glibc-mesboot: Remove %bootstrap-glibc., Jan Nieuwenhuizen, 2018/09/03
- 184/192: gnu: mesboot-headers: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 179/192: gnu: tcc-boot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 180/192: gnu: make-mesboot0: Cleanup.,
Jan Nieuwenhuizen <=
- 189/192: gnu: make-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 187/192: gnu: make-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 177/192: gnu: mes-boot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 183/192: gnu: gcc-core-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 185/192: gnu: glibc-mesboot0: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 65/192: gnu: binutils-boot: Update to 2.25., Jan Nieuwenhuizen, 2018/09/03
- 191/192: gnu: glibc-headers-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 190/192: gnu: gcc-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 192/192: gnu: glibc-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/03
- 173/192: gnu: Add mesboot-headers., Jan Nieuwenhuizen, 2018/09/03