[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/92: gnu: glibc/hurd-headers: Properly cross-build.
From: |
guix-commits |
Subject: |
02/92: gnu: glibc/hurd-headers: Properly cross-build. |
Date: |
Fri, 23 Jun 2023 12:45:36 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit b33bb17e4c557266bceccfe95300d664f6c22a11
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Mon May 22 11:04:12 2023 +0200
gnu: glibc/hurd-headers: Properly cross-build.
* gnu/packages/base.scm (glibc/hurd-headers): Rely on cross-mig, and remove
hardcoded configure flag `--host=i586-pc-gnu`.
* gnu/packages/cross-base.scm (cross-kernel-headers*): Add `--host` and
`--build` configure flags.
---
gnu/packages/base.scm | 13 ++++++-------
gnu/packages/cross-base.scm | 6 +++++-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index ada9edf0e6..9778cb6343 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1427,17 +1427,15 @@ command.")
(native-inputs
(modify-inputs (package-native-inputs glibc)
(prepend (if (%current-target-system)
- ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG,
- ;; hence this hack.
- (package (inherit mig)
- (arguments `(#:system "i686-linux")))
- mig))))
+ (let* ((cross-base (resolve-interface '(gnu packages
cross-base)))
+ (cross-mig (module-ref cross-base 'cross-mig)))
+ (cross-mig (%current-target-system)))
+ mig))))
(arguments
(substitute-keyword-arguments (package-arguments glibc)
;; We just pass the flags really needed to build the headers.
((#:configure-flags flags)
`(list "--enable-add-ons"
- "--host=i586-pc-gnu"
,@%glibc/hurd-configure-flags))
((#:phases _)
'(modify-phases %standard-phases
@@ -1452,7 +1450,8 @@ command.")
(close-port
(open-output-file
(string-append out "/include/gnu/stubs.h"))))))
- (delete 'build))))))) ; nothing to build
+ (delete 'build))))) ; nothing to build
+ (supported-systems %hurd-systems)))
(define-public tzdata
(package
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 8d0b41180b..50e86083c3 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -492,7 +492,11 @@ the base compiler. Use XBINUTILS as the associated
cross-Binutils."
hurd "/include")))
(for-each (cut setenv <> cpath)
',%gcc-cross-include-paths)
- #t)))))))
+ #t)))))
+ ((#:configure-flags flags)
+ `(cons* ,(string-append "--build=" (%current-system))
+ ,(string-append "--host=" target)
+ ,flags))))
(propagated-inputs `(("gnumach-headers" ,xgnumach-headers)
("hurd-headers" ,xhurd-headers)))
- branch hurd-team created (now 479de78f62), guix-commits, 2023/06/23
- 03/92: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/06/23
- 04/92: gnu: hurd: Update supported systems., guix-commits, 2023/06/23
- 06/92: squash! gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/23
- 07/92: squash! gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/23
- 01/92: hurd-boot: Add urandom and default-pager translators., guix-commits, 2023/06/23
- 02/92: gnu: glibc/hurd-headers: Properly cross-build.,
guix-commits <=
- 05/92: gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/23
- 10/92: gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/23
- 14/92: gnu: Add libpciaccess-0.17., guix-commits, 2023/06/23
- 16/92: gnu: Add rumpkernel., guix-commits, 2023/06/23
- 19/92: gnu: hurd: Add rumpkernel., guix-commits, 2023/06/23
- 08/92: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/06/23
- 12/92: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/06/23
- 13/92: Revert "hurd-boot: Add urandom and default-pager translators.", guix-commits, 2023/06/23
- 15/92: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/06/23
- 09/92: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/06/23