[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/24: gnu: gnumach-headers: Cross-build without relying on x86.
From: |
guix-commits |
Subject: |
02/24: gnu: gnumach-headers: Cross-build without relying on x86. |
Date: |
Thu, 13 Jul 2023 13:02:36 -0400 (EDT) |
jpoiret pushed a commit to branch master
in repository guix.
commit c2bb342b5ff0ac15d6dc37a9ba8daeb8956237e1
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 | 11 +----------
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index e5fc4ba8b5..cdf642358d 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -375,6 +375,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..438f07c20c 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Rene Saavedra <pacoon@protonmail.com>
+;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -75,16 +76,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 master updated (ff208b4b62 -> d17879cd0d), guix-commits, 2023/07/13
- 01/24: gnu: glibc/hurd-headers: Properly cross-build., guix-commits, 2023/07/13
- 04/24: gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/07/13
- 06/24: gnu: mig: Update to 1.8+git20230520., guix-commits, 2023/07/13
- 08/24: gnu: Add libpciaccess-0.17., guix-commits, 2023/07/13
- 10/24: gnu: Add rumpkernel., guix-commits, 2023/07/13
- 17/24: bootloader: grub: Use rumpdisk-style root when booting with "noide"., guix-commits, 2023/07/13
- 19/24: gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1., guix-commits, 2023/07/13
- 20/24: hurd-boot: Cater for netdde., guix-commits, 2023/07/13
- 02/24: gnu: gnumach-headers: Cross-build without relying on x86.,
guix-commits <=
- 03/24: gnu: hurd: Update supported systems., guix-commits, 2023/07/13
- 05/24: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/07/13
- 07/24: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/07/13
- 09/24: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/07/13
- 12/24: gnu: parted: Support building for the Hurd., guix-commits, 2023/07/13
- 14/24: hurd-boot: Setup pci-arbiter and rumpdisk translators., guix-commits, 2023/07/13
- 16/24: system: hurd: Boot with pci.arbiter and rumpdisk., guix-commits, 2023/07/13
- 18/24: gnu: gnumach: Support "noide" argument., guix-commits, 2023/07/13
- 22/24: services: static-networking: Support netdde for the Hurd., guix-commits, 2023/07/13
- 23/24: gnu: gnumach: Disable builtin networking., guix-commits, 2023/07/13