[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
189/192: gnu: make-mesboot: Cleanup.
From: |
Jan Nieuwenhuizen |
Subject: |
189/192: gnu: make-mesboot: Cleanup. |
Date: |
Mon, 3 Sep 2018 16:25:25 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 1bd78b8dd9ff1bc99e1abbeb2967e5644f88184c
Author: Jan Nieuwenhuizen <address@hidden>
Date: Mon Sep 3 16:11:55 2018 +0200
gnu: make-mesboot: Cleanup.
* gnu/packages/commencement.scm (make-mesboot): Cleanup.
---
gnu/packages/commencement.scm | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index d287e77..eac65a3 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1073,23 +1073,17 @@ ac_cv_c_float_format='IEEE (little-endian)'
("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
- #: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))))))))))
+ `(,@(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")
+ #f))))))))))
(define gmp-boot
(package
- 161/192: gnu: make-boot0: Set LOADLIBES for i686-linux., (continued)
- 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, 2018/09/03
- 189/192: gnu: make-mesboot: Cleanup.,
Jan Nieuwenhuizen <=
- 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
- 186/192: gnu: gcc-mesboot0: Cleanup., Jan Nieuwenhuizen, 2018/09/03