[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
165/176: Revert "gnu: make-boot0: Set LOADLIBES for i686-linux."
From: |
Jan Nieuwenhuizen |
Subject: |
165/176: Revert "gnu: make-boot0: Set LOADLIBES for i686-linux." |
Date: |
Fri, 31 Aug 2018 11:20:34 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 30862216f12b8f5feaee4c7ebe67fbfac5c96a4d
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Aug 31 14:19:46 2018 +0200
Revert "gnu: make-boot0: Set LOADLIBES for i686-linux."
This reverts commit 8e1977169c1bdb1236c147c93bdfe2ac77c91bd5.
---
gnu/packages/commencement.scm | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index e0279cd..9ebf1b7 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1705,24 +1705,16 @@ exec " gcc "/bin/gcc"
,@(substitute-keyword-arguments (package-arguments gnu-make)
((#:phases phases)
`(modify-phases ,phases
- ,@(append
- (match (%current-system)
- ("i686-linux"
- '((add-before 'build 'configure-fixup
- (lambda _
- (substitute* "build.sh"
- (("^LOADLIBES=.*") "LOADLIBES='-ldl -lc
-lnss_files -lnss_dns -lresolv'\n"))))))
- (_ '()))
- '((replace 'build
- (lambda _
- (invoke "./build.sh")
- #t))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (install-file "make" bin)
- #t))))))))))
+ (replace 'build
+ (lambda _
+ (invoke "./build.sh")
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin")))
+ (install-file "make" bin)
+ #t))))))))
(native-inputs '()) ; no need for 'pkg-config'
(inputs %bootstrap-inputs+toolchain))))
- 129/176: gnu: %mes-seed: Update for mes 0.17., (continued)
- 129/176: gnu: %mes-seed: Update for mes 0.17., Jan Nieuwenhuizen, 2018/08/31
- 154/176: Revert "gnu: Add %bootstrap-diffutils.", Jan Nieuwenhuizen, 2018/08/31
- 140/176: gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball., Jan Nieuwenhuizen, 2018/08/31
- 161/176: gnu: make-boot0: Set LOADLIBES for i686-linux., Jan Nieuwenhuizen, 2018/08/31
- 126/176: gnu: gcc-mesboot0: Revise dependencies., Jan Nieuwenhuizen, 2018/08/31
- 136/176: gnu: tcc-boot0: Use gnu-build-system., Jan Nieuwenhuizen, 2018/08/31
- 131/176: gnu: mes: Update to 0.17., Jan Nieuwenhuizen, 2018/08/31
- 164/176: gnu: Add gcc-mesboot-wrapper 4.7.4., Jan Nieuwenhuizen, 2018/08/31
- 160/176: gnu: Add mpc-boot 1.0.3., Jan Nieuwenhuizen, 2018/08/31
- 166/176: gnu: diffutils-boot0: Export (for testing)., Jan Nieuwenhuizen, 2018/08/31
- 165/176: Revert "gnu: make-boot0: Set LOADLIBES for i686-linux.",
Jan Nieuwenhuizen <=
- 87/176: gnu: %mes-seed: Update for mes 0.16., Jan Nieuwenhuizen, 2018/08/31
- 77/176: Revert "gnu: gcc-boot: Update to 3.0.", Jan Nieuwenhuizen, 2018/08/31
- 102/176: gnu: gcc-core-mesboot: Rename from gcc-core-boot., Jan Nieuwenhuizen, 2018/08/31
- 103/176: gnu: glibc-mesboot: Rename from glibc-boot., Jan Nieuwenhuizen, 2018/08/31
- 107/176: gnu: Add gcc-mesboot 4.1.0., Jan Nieuwenhuizen, 2018/08/31
- 119/176: gnu: %mes-seed: Update for mes 0.16.1., Jan Nieuwenhuizen, 2018/08/31
- 121/176: gnu: tcc-boot0: Revise dependencies., Jan Nieuwenhuizen, 2018/08/31
- 157/176: Revert "gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball.", Jan Nieuwenhuizen, 2018/08/31
- 163/176: Add new cheat: use %bootstrap-glibc for x86 for now., Jan Nieuwenhuizen, 2018/08/31
- 137/176: gnu: tcc-boot: Use gnu-build-system., Jan Nieuwenhuizen, 2018/08/31