[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
161/192: gnu: make-boot0: Set LOADLIBES for i686-linux.
From: |
Jan Nieuwenhuizen |
Subject: |
161/192: gnu: make-boot0: Set LOADLIBES for i686-linux. |
Date: |
Mon, 3 Sep 2018 16:25:19 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit e3ae1c5e019a1898c4ab22ac6c450594785a1b2d
Author: Jan Nieuwenhuizen <address@hidden>
Date: Tue Aug 28 23:12:59 2018 +0200
gnu: make-boot0: Set LOADLIBES for i686-linux.
* gnu/packages/commencement.scm (gnu-make-boot0): Set LOADLIBES for
i686-linux.
---
gnu/packages/commencement.scm | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 4fa26c3..dd41025 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1398,16 +1398,24 @@ ac_cv_c_float_format='IEEE (little-endian)'
,@(substitute-keyword-arguments (package-arguments gnu-make)
((#:phases phases)
`(modify-phases ,phases
- (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))))))))
+ ,@(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))))))))))
(native-inputs '()) ; no need for 'pkg-config'
(inputs %bootstrap-inputs+toolchain))))
- 142/192: gnu: Add %linux-libre-headers-stripped, %linux-libre-headers-bootstrap-tarball., (continued)
- 142/192: gnu: Add %linux-libre-headers-stripped, %linux-libre-headers-bootstrap-tarball., Jan Nieuwenhuizen, 2018/09/03
- 150/192: gnu: Add make-mesboot 3.79., Jan Nieuwenhuizen, 2018/09/03
- 151/192: gnu: Add diffutils-mesboot 2.7., Jan Nieuwenhuizen, 2018/09/03
- 137/192: gnu: tcc-boot: Use gnu-build-system., Jan Nieuwenhuizen, 2018/09/03
- 154/192: Revert "gnu: Add %bootstrap-diffutils.", Jan Nieuwenhuizen, 2018/09/03
- 153/192: bootstrap: Remove dependency on %bootstrap-make, %bootstrap-diffutils., Jan Nieuwenhuizen, 2018/09/03
- 152/192: gnu: make-mesboot: Update to 3.80., Jan Nieuwenhuizen, 2018/09/03
- 160/192: gnu: Add mpc-boot 1.0.3., Jan Nieuwenhuizen, 2018/09/03
- 158/192: gnu: Add make-mesboot0 3.80, Jan Nieuwenhuizen, 2018/09/03
- 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 <=
- 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, 2018/09/03