[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62307] [PATCH core-updates 02/15] gnu-build-system: Sneak fixed gli
From: |
Josselin Poiret |
Subject: |
[bug#62307] [PATCH core-updates 02/15] gnu-build-system: Sneak fixed glibc when cross-building for Hurd. |
Date: |
Mon, 20 Mar 2023 23:10:37 +0100 |
* guix/build-system/gnu.scm (standard-cross-packages): Do it.
---
guix/build-system/gnu.scm | 48 +++++++++++++++++++++++----------------
1 file changed, 28 insertions(+), 20 deletions(-)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 3308302472..98cf272726 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -442,30 +442,38 @@ (define standard-cross-packages
(mlambda (target kind)
"Return the list of name/package tuples to cross-build for TARGET. KIND
is one of `host' or `target'."
- (let* ((cross (resolve-interface '(gnu packages cross-base)))
- (gcc (module-ref cross 'cross-gcc))
- (binutils (module-ref cross 'cross-binutils))
- (libc (module-ref cross 'cross-libc)))
+ (let* ((cross (resolve-interface '(gnu packages cross-base)))
+ (cross-gcc (module-ref cross 'cross-gcc))
+ (cross-binutils (module-ref cross 'cross-binutils))
+ (cross-libc (module-ref cross 'cross-libc))
+ (libc (match target
+ ;; FIXME Remove this once the fix is in our glibc
+ ("i586-pc-gnu"
+ (cross-libc target
+ #:libc
+ (module-ref
+ (resolve-interface '(gnu packages base))
+ 'glibc/fix-for-hurd-cross)))
+ (_ (cross-libc target)))))
(case kind
((host)
;; Cross-GCC appears once here, so that it's in $PATH...
- `(("cross-gcc" ,(gcc target
- #:xbinutils (binutils target)
- #:libc (libc target)))
- ("cross-binutils" ,(binutils target))))
+ `(("cross-gcc" ,(cross-gcc target
+ #:xbinutils (cross-binutils target)
+ #:libc libc))
+ ("cross-binutils" ,(cross-binutils target))))
((target)
- (let ((libc (libc target)))
- ;; ... and once here, so that libstdc++ & co. are in
- ;; CROSS_CPLUS_INCLUDE_PATH, etc.
- `(("cross-gcc" ,(gcc target
- #:xbinutils (binutils target)
- #:libc libc))
- ("cross-libc" ,libc)
-
- ;; MinGW's libc doesn't have a "static" output.
- ,@(if (member "static" (package-outputs libc))
- `(("cross-libc:static" ,libc "static"))
- '()))))))))
+ ;; ... and once here, so that libstdc++ & co. are in
+ ;; CROSS_CPLUS_INCLUDE_PATH, etc.
+ `(("cross-gcc" ,(cross-gcc target
+ #:xbinutils (cross-binutils target)
+ #:libc libc))
+ ("cross-libc" ,libc)
+
+ ;; MinGW's libc doesn't have a "static" output.
+ ,@(if (member "static" (package-outputs libc))
+ `(("cross-libc:static" ,libc "static"))
+ '())))))))
(define* (gnu-cross-build name
#:key
--
2.39.2
- [bug#62307] [PATCH core-updates 00/15] Update Hurd and fix build failures, Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 01/15] gnu: glibc/fix-for-hurd-cross: Add new variant., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 03/15] gcc-11: Patch libstdc++ libpthread issue for Hurd only., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 04/15] cross-base: Factor out cross-mig., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 02/15] gnu-build-system: Sneak fixed glibc when cross-building for Hurd.,
Josselin Poiret <=
- [bug#62307] [PATCH core-updates 06/15] cross-base: Removed useless inputs to xhurd-core-headers., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 07/15] mig: Update to 1.8+git20220827., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 10/15] hurd: Remove useless glibc/hurd-headers input., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 13/15] mig/32-bit: Remove., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 12/15] hurd: Update DDE and use libdde_linux26., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 15/15] system: pam: Only add linux-pam reference if on Linux., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 05/15] cross-base: Add cross arguments to hurd derivatives., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 08/15] gnumach: Update to 1.8+git20220827., Josselin Poiret, 2023/03/20
- [bug#62307] [PATCH core-updates 11/15] gnumach, hurd-headers, hurd: Switch to using cross-mig., Josselin Poiret, 2023/03/20