[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/92: gnu: gnumach-headers: Cross-build without relying on x86.
From: |
guix-commits |
Subject: |
03/92: gnu: gnumach-headers: Cross-build without relying on x86. |
Date: |
Fri, 23 Jun 2023 12:45:36 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 282850ef1f9c9071b46beff1b6bca99e9e05fcc8
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Mon May 22 11:04:13 2023 +0200
gnu: gnumach-headers: Cross-build without relying on x86.
* gnu/packages/hurd.scm (gnumach-headers): Remove configure flags where we
say the builder is running x86.
* gnu/packages/cross-base.scm (cross-gnumach-headers): Work around
limitation
of build system, by manually changing the target host_cpu without relying on
--host, because we don't have a working cross-compiler yet.
---
gnu/packages/cross-base.scm | 18 ++++++++++++++++++
gnu/packages/hurd.scm | 10 ----------
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 50e86083c3..01c2295853 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -374,6 +374,24 @@ target that libc."
(inherit gnumach-headers)
(name (string-append (package-name gnumach-headers)
"-cross-" target))
+ (arguments
+ (substitute-keyword-arguments (package-arguments gnumach-headers)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ ;; Cheat by setting the host_cpu variable manually, since using
+ ;; --host= would require a working cross-compiler, which we don't
+ ;; have yet.
+ (add-after 'unpack 'substitute-host-cpu
+ (lambda _
+ (substitute* "configure.ac"
+ (("AC_CANONICAL_HOST")
+ #$(string-append
+ "host_cpu="
+ (match target
+ ((? target-x86-32?)
+ "i386")
+ ((? target-x86-64?)
+ "x86_64")))))))))))
(native-inputs
(modify-inputs (package-native-inputs gnumach-headers)
(prepend xgcc xbinutils)))))
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index c9f77d799a..bf38c45273 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -75,16 +75,6 @@
(lambda _
(invoke "make" "install-data")))
(delete 'build))
-
- ;; GNU Mach supports only IA32 currently, so cheat so that we can at
- ;; least install its headers.
- ,@(if (%current-target-system)
- '()
- ;; See
<http://lists.gnu.org/archive/html/bug-hurd/2015-06/msg00042.html>
- ;;
<http://lists.gnu.org/archive/html/guix-devel/2015-06/msg00716.html>
- '(#:configure-flags '("--build=i586-pc-gnu"
- "--host=i686-linux-gnu")))
-
#:tests? #f))
(native-inputs
(list autoconf automake texinfo-4))
- branch hurd-team created (now 479de78f62), guix-commits, 2023/06/23
- 03/92: gnu: gnumach-headers: Cross-build without relying on x86.,
guix-commits <=
- 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, 2023/06/23
- 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