[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/33: gnu: cross-libc: Build fix for the Hurd.
From: |
guix-commits |
Subject: |
13/33: gnu: cross-libc: Build fix for the Hurd. |
Date: |
Tue, 10 Mar 2020 03:58:46 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 6f8916cde2ee21ac79360826be6d7aa727637cd9
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 667d1f7..d88c1b5 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -494,7 +494,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 c32b649), guix-commits, 2020/03/10
- 04/33: gnu: bootloader: Add grub-minimal-bootloader., guix-commits, 2020/03/10
- 03/33: gnu: Add grub-minimal., guix-commits, 2020/03/10
- 05/33: gnu: hurd: Fix hurd-target?., guix-commits, 2020/03/10
- 06/33: gnu: hurd: Add hurd-system?., guix-commits, 2020/03/10
- 07/33: gnu: java-jansi-native: Compile fix for the Hurd., guix-commits, 2020/03/10
- 08/33: gnu: make: Revert to 4.1 for the Hurd., guix-commits, 2020/03/10
- 01/33: gnu: flex-2.6.1: Build fix for the Hurd., guix-commits, 2020/03/10
- 11/33: gnu: glibc: Add and update patches for the Hurd., guix-commits, 2020/03/10
- 02/33: gnu: grub: Build fix for the Hurd., guix-commits, 2020/03/10
- 13/33: gnu: cross-libc: Build fix for the Hurd.,
guix-commits <=
- 17/33: gnu: pciutils: Build fix for the Hurd., guix-commits, 2020/03/10
- 25/33: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/10
- 27/33: gnu: commencement: glibc-intermediate: Build fixes for the Hurd., guix-commits, 2020/03/10
- 09/33: gnu: less: Build fix for the Hurd., guix-commits, 2020/03/10
- 18/33: gnu: shepherd: Build fix for the Hurd., guix-commits, 2020/03/10
- 10/33: gnu: fontconfig: Build fix for the Hurd., guix-commits, 2020/03/10
- 19/33: gnu: inetutils: Support for the Hurd., guix-commits, 2020/03/10
- 31/33: gnu: commencement: glibc-final: Allow gnumach-headers references., guix-commits, 2020/03/10
- 21/33: gnu: shadow: Build fix for the Hurd., guix-commits, 2020/03/10
- 12/33: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., guix-commits, 2020/03/10