[bug#53049] [PATCH] gnu: libaio: Fix cross-compilation.

[bug#53049] [PATCH] gnu: libaio: Fix cross-compilation.

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

Hi Guix!

I saw a message on the unofficial #guix:matrix.org room about libaio
failing to build. Indeed, it uses %output and that doesn't exist in
cross-compilation context anymore. Here's a small patch to fix that. I
had to be careful not to change the package outside of
cross-compilation, since it has >5000 dependents, hence the ,(if ...)
statement.

[-- Attachment #2: 0001-gnu-libaio-Fix-cross-compilation.patch --]
[-- Type: text/x-patch, Size: 1150 bytes --]

From 160572309d022b4249cb41296864a0e1c32eae0a Mon Sep 17 00:00:00 2001
Message-Id: <160572309d022b4249cb41296864a0e1c32eae0a.1641468451.git.julien@lepiller.eu>
From: Julien Lepiller <julien@lepiller.eu>
Date: Thu, 6 Jan 2022 11:48:16 +0100
Subject: [PATCH] gnu: libaio: Fix cross-compilation.

* gnu/packages/linux.scm (libaio)[arguments]: Do not use singular
%output.
---
 gnu/packages/linux.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3daad494e1..438ced6a27 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5225,7 +5225,9 @@ (define-public libaio
     (arguments
      `(#:make-flags
        (let ((target ,(%current-target-system)))
-         (list (string-append "prefix=" %output)
+         (list (string-append "prefix=" ,(if (%current-target-system)
+                                             `(assoc-ref %outputs "out")
+                                             '%output))
                (string-append
                 "CC=" (if target
                           (string-append (assoc-ref %build-inputs "cross-gcc")
-- 
2.34.0

[bug#53049] [PATCH] gnu: libaio: Fix cross-compilation.

[Ludovic Courtès]

Hi,

Julien Lepiller <julien@lepiller.eu> skribis:

>>From 160572309d022b4249cb41296864a0e1c32eae0a Mon Sep 17 00:00:00 2001
> Message-Id: <160572309d022b4249cb41296864a0e1c32eae0a.1641468451.git.julien@lepiller.eu>
> From: Julien Lepiller <julien@lepiller.eu>
> Date: Thu, 6 Jan 2022 11:48:16 +0100
> Subject: [PATCH] gnu: libaio: Fix cross-compilation.
>
> * gnu/packages/linux.scm (libaio)[arguments]: Do not use singular
> %output.

LGTM!  (You could add a TODO stating it should be homogenized on the
next rebuild cycle.)

Thanks,
Ludo’.

bug#53049: [PATCH] gnu: libaio: Fix cross-compilation.

[Tobias Geerinckx-Rice via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

Hi,

Julien Lepiller wrote:
> Subject: [PATCH] gnu: libaio: Fix cross-compilation.

I pushed a series of cross-compilation fixes yesterday night to 
fix the pinebook-pro image build ASAP.

It was pretty bad: there was no valid CI build, so the 
guix.gnu.org ‘Download’ was just… broken.  I didn't notice your 
patch.

Mine looks slightly different (preferring as I do shiny gexps, and 
trying to move away from %output{s,} :-) but the thrust is the 
same, comment included.

Thanks! and closing,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

[bug#53049] [PATCH] gnu: libaio: Fix cross-compilation.

[Mathieu Othacehe]

Hello Tobias,

> It was pretty bad: there was no valid CI build, so the guix.gnu.org ‘Download’
> was just… broken.  I didn't notice your patch.
>
> Mine looks slightly different (preferring as I do shiny gexps, and trying to
> move away from %output{s,} :-) but the thrust is the same, comment included.

We now have 100% coverage on the "images" specifications[1], thanks for
fixing that :).

Mathieu

[1]: https://ci.guix.gnu.org/jobset/images