GNU bug report logs - #49416
[PATCH core-updates] build-system/gnu: Re-introduce %build-inputs.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49416 in the body.
You can then email your comments to 49416 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: guix-patches <at> gnu.org
Subject: [PATCH core-updates] build-system/gnu: Re-introduce %build-inputs.
Date: Mon, 05 Jul 2021 15:26:07 +0200

[Message part 1 (text/plain, inline)]

%build-inputs was not defined anymore when cross-compiling.
This causes some build failures on core-updates, see e.g.
<https://ci.guix.gnu.org/build/653883/log/raw>;.  According
to civodul on IRC, this removal of %build-inputs was
accidental, so re-introduce it.

This allows "guix build grep --target=aarch64-linux-gnu" to
succeed on a x86_64-linux machine.  The resulting binary
is executable under qemu-aarch64.

[0001-build-system-gnu-Re-introduce-build-inputs.patch (text/x-patch, inline)]

From 97923752ae25b5fe9d48d43fd2d4a4eab03f8a90 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos <at> telenet.be>
Date: Mon, 5 Jul 2021 15:17:53 +0200
Subject: [PATCH core-updates] build-system/gnu: Re-introduce %build-inputs.

%build-inputs was not defined anymore when cross-compiling.
This causes some build failures on core-updates, see e.g.
<https://ci.guix.gnu.org/build/653883/log/raw>.  According
to civodul on IRC, this removal of %build-inputs was
accidental, so re-introduce it.

This allows "guix build grep --target=aarch64-linux-gnu" to
succeed on a x86_64-linux machine.  The resulting binary
is executable under qemu-aarch64.

* guix/build-system/gnu.scm
  (gnu-cross-build)[builder]: Define '%build-inputs', again.
---
 guix/build-system/gnu.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index c74acb51b0..3af848034f 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo <at> gnu.org>
+;;; Copyright © 2021 Maxime Devos <maximedevos <at> telenet.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -516,6 +517,9 @@ platform."
           (append #$(input-tuples->gexp host-inputs)
                   #+(input-tuples->gexp target-inputs)))
 
+        (define %build-inputs
+          (append %build-host-inputs %build-target-inputs))
+
         (define %outputs
           #$(outputs->gexp outputs))
 
-- 
2.32.0

[signature.asc (application/pgp-signature, inline)]

Message #10 received at 49416-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Maxime Devos <maximedevos <at> telenet.be>
Cc: 49416-done <at> debbugs.gnu.org
Subject: Re: bug#49416: [PATCH core-updates] build-system/gnu: Re-introduce
 %build-inputs.
Date: Mon, 05 Jul 2021 16:32:28 +0200

Hi Maxime,

Maxime Devos <maximedevos <at> telenet.be> skribis:

> From 97923752ae25b5fe9d48d43fd2d4a4eab03f8a90 Mon Sep 17 00:00:00 2001
> From: Maxime Devos <maximedevos <at> telenet.be>
> Date: Mon, 5 Jul 2021 15:17:53 +0200
> Subject: [PATCH core-updates] build-system/gnu: Re-introduce %build-inputs.
>
> %build-inputs was not defined anymore when cross-compiling.
> This causes some build failures on core-updates, see e.g.
> <https://ci.guix.gnu.org/build/653883/log/raw>.  According
> to civodul on IRC, this removal of %build-inputs was
> accidental, so re-introduce it.
>
> This allows "guix build grep --target=aarch64-linux-gnu" to
> succeed on a x86_64-linux machine.  The resulting binary
> is executable under qemu-aarch64.
>
> * guix/build-system/gnu.scm
>   (gnu-cross-build)[builder]: Define '%build-inputs', again.
> ---
>  guix/build-system/gnu.scm | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
> index c74acb51b0..3af848034f 100644
> --- a/guix/build-system/gnu.scm
> +++ b/guix/build-system/gnu.scm
> @@ -1,5 +1,6 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo <at> gnu.org>
> +;;; Copyright © 2021 Maxime Devos <maximedevos <at> telenet.be>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -516,6 +517,9 @@ platform."
>            (append #$(input-tuples->gexp host-inputs)
>                    #+(input-tuples->gexp target-inputs)))
>  
> +        (define %build-inputs
> +          (append %build-host-inputs %build-target-inputs))

I pushed the same thing independently as
8a4830231871c578c80523e973ecd85f1f596ba6, sorry for duplicated work!

I had it in store but wanted to fix issues one at a time, and that took
a while…  ‘core-updates’ is starting to be in a better state, so
hopefully we’ll have a better idea of what the status is now.

Thanks,
Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.