Message ID | 95f586a42c5dfaf8916a2fffc50f62be3a1d2f7c.camel@telenet.be |
---|---|
State | Accepted |
Headers | show |
Series | [bug#49416,core-updates] build-system/gnu: Re-introduce %build-inputs. | expand |
Context | Check | Description |
---|---|---|
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
Hi Maxime, Maxime Devos <maximedevos@telenet.be> skribis: > From 97923752ae25b5fe9d48d43fd2d4a4eab03f8a90 Mon Sep 17 00:00:00 2001 > From: Maxime Devos <maximedevos@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@gnu.org> > +;;; Copyright © 2021 Maxime Devos <maximedevos@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’.
From 97923752ae25b5fe9d48d43fd2d4a4eab03f8a90 Mon Sep 17 00:00:00 2001 From: Maxime Devos <maximedevos@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@gnu.org> +;;; Copyright © 2021 Maxime Devos <maximedevos@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