unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#53049] [PATCH] gnu: libaio: Fix cross-compilation.
@ 2022-01-06 11:30 Julien Lepiller
  2022-01-08 21:57 ` Ludovic Courtès
  0 siblings, 1 reply; 4+ messages in thread
From: Julien Lepiller @ 2022-01-06 11:30 UTC (permalink / raw)
  To: 53049

[-- 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#53049] [PATCH] gnu: libaio: Fix cross-compilation.
  2022-01-06 11:30 [bug#53049] [PATCH] gnu: libaio: Fix cross-compilation Julien Lepiller
@ 2022-01-08 21:57 ` Ludovic Courtès
  2022-01-08 22:14   ` bug#53049: " Tobias Geerinckx-Rice via Guix-patches via
  0 siblings, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2022-01-08 21:57 UTC (permalink / raw)
  To: Julien Lepiller; +Cc: 53049

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’.




^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#53049: [PATCH] gnu: libaio: Fix cross-compilation.
  2022-01-08 21:57 ` Ludovic Courtès
@ 2022-01-08 22:14   ` Tobias Geerinckx-Rice via Guix-patches via
  2022-01-09  9:43     ` [bug#53049] " Mathieu Othacehe
  0 siblings, 1 reply; 4+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2022-01-08 22:14 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: Julien Lepiller, guix-patches, 53049-done

[-- 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 --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#53049] [PATCH] gnu: libaio: Fix cross-compilation.
  2022-01-08 22:14   ` bug#53049: " Tobias Geerinckx-Rice via Guix-patches via
@ 2022-01-09  9:43     ` Mathieu Othacehe
  0 siblings, 0 replies; 4+ messages in thread
From: Mathieu Othacehe @ 2022-01-09  9:43 UTC (permalink / raw)
  To: me; +Cc: julien, 53049


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




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-01-09  9:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-06 11:30 [bug#53049] [PATCH] gnu: libaio: Fix cross-compilation Julien Lepiller
2022-01-08 21:57 ` Ludovic Courtès
2022-01-08 22:14   ` bug#53049: " Tobias Geerinckx-Rice via Guix-patches via
2022-01-09  9:43     ` [bug#53049] " Mathieu Othacehe

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).