[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/31: gnu: cross-libc: Build fix for the Hurd.
From: |
guix-commits |
Subject: |
05/31: gnu: cross-libc: Build fix for the Hurd. |
Date: |
Tue, 24 Mar 2020 18:38:47 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit ee1cf1dd80244fe187038db609bde282b21a05fc
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Mon Mar 9 14:38:18 2020 +0100
gnu: cross-libc: Build fix for the Hurd.
This fixes cross building of coreutils, e.g.
./pre-inst-env guix build --target=i586-pc-gnu coreutils
* gnu/packages/cross-base.scm (cross-libc): Add -lhurduser, -lmachuser for
the
Hurd.
---
gnu/packages/cross-base.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 6f72653..538f406 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -513,7 +513,17 @@ and the cross tool chain."
',%gcc-cross-include-paths)
(setenv "CROSS_LIBRARY_PATH"
(string-append kernel "/lib")) ; for Hurd's
libihash
- #t)))))))
+ #t)))
+ ,@(if (hurd-triplet? target)
+ '((add-after 'install 'augment-libc.so
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (substitute* (string-append out "/lib/libc.so")
+ (("/[^ ]+/lib/libc.so.0.3")
+ (string-append out "/lib/libc.so.0.3"
+ " libmachuser.so
libhurduser.so"))))
+ #t)))
+ '())))))
;; Shadow the native "kernel-headers" because glibc's recipe expects
the
;; "kernel-headers" input to point to the right thing.
- branch wip-hurd created (now 3d5bdf4), guix-commits, 2020/03/24
- 02/31: gnu: hurd: Fix hurd-target?, add hurd-system?., guix-commits, 2020/03/24
- 05/31: gnu: cross-libc: Build fix for the Hurd.,
guix-commits <=
- 12/31: gnu: commencement: gnumach-headers-boot0: Build from tarball., guix-commits, 2020/03/24
- 14/31: gnu: commencement: hurd-minimal-boot0: Build from tarball., guix-commits, 2020/03/24
- 06/31: Revert "gnu: guile-static-stripped: Update to 2.2.", guix-commits, 2020/03/24
- 09/31: gnu: bootstrap: Add support for the Hurd., guix-commits, 2020/03/24
- 04/31: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., guix-commits, 2020/03/24
- 21/31: daemon: Avoid kill -1 bug on the Hurd., guix-commits, 2020/03/24
- 10/31: gnu: java-jansi-native: Compile fix for the Hurd., guix-commits, 2020/03/24
- 17/31: gnu: commencement: gnumach-headers-boot0: Update to 1.8-116-g28b53508., guix-commits, 2020/03/24
- 18/31: gnu: commencement: glibc-final: Allow gnumach-headers references., guix-commits, 2020/03/24
- 25/31: gnu: pciutils: Build fixes for the Hurd., guix-commits, 2020/03/24