[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
161/211: gnu: make-boot0: Set LOADLIBES for i686-linux.
From: |
Jan Nieuwenhuizen |
Subject: |
161/211: gnu: make-boot0: Set LOADLIBES for i686-linux. |
Date: |
Sat, 8 Sep 2018 11:09:49 -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))))
- 167/211: gnu: gcc-mesboot: Enable c++ too., (continued)
- 167/211: gnu: gcc-mesboot: Enable c++ too., Jan Nieuwenhuizen, 2018/09/08
- 152/211: gnu: make-mesboot: Update to 3.80., Jan Nieuwenhuizen, 2018/09/08
- 144/211: gnu: bootstrap-tarballs: Update inputs for i686-linux., Jan Nieuwenhuizen, 2018/09/08
- 91/211: gnu: gcc-core-boot: Install libgcc2.a too., Jan Nieuwenhuizen, 2018/09/08
- 151/211: gnu: Add diffutils-mesboot 2.7., Jan Nieuwenhuizen, 2018/09/08
- 168/211: gnu: gcc-mesboot-wrapper: Wrap g++ too., Jan Nieuwenhuizen, 2018/09/08
- 200/211: gnu: findutils-boot0: Remove bootstrap leaks., Jan Nieuwenhuizen, 2018/09/08
- 176/211: mescc-tools-boot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 166/211: gnu: file-boot0: Do not strip binaries or validate-runpath., Jan Nieuwenhuizen, 2018/09/08
- 124/211: gnu: gcc-core-mesboot: Revise dependencies., Jan Nieuwenhuizen, 2018/09/08
- 161/211: gnu: make-boot0: Set LOADLIBES for i686-linux.,
Jan Nieuwenhuizen <=
- 97/211: gnu: gcc-boot: build with %cheat-binutils?, Jan Nieuwenhuizen, 2018/09/08
- 107/211: gnu: Add gcc-mesboot 4.1.0., Jan Nieuwenhuizen, 2018/09/08
- 156/211: Revert "gnu: Add %bootstrap-make.", Jan Nieuwenhuizen, 2018/09/08
- 149/211: gnu: tcc-boot: Update for mes 0.17.1., Jan Nieuwenhuizen, 2018/09/08
- 148/211: gnu: mes-boot: Update to 0.17.1., Jan Nieuwenhuizen, 2018/09/08
- 125/211: gnu: glibc-mesboot: Revise dependencies., Jan Nieuwenhuizen, 2018/09/08
- 173/211: gnu: Add mesboot-headers., Jan Nieuwenhuizen, 2018/09/08
- 182/211: gnu: binutils-mesboot0: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 143/211: gnu: Add %bootstrap-linux-libre-headers., Jan Nieuwenhuizen, 2018/09/08
- 138/211: gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball., Jan Nieuwenhuizen, 2018/09/08