unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Julien Lepiller <julien@lepiller.eu>
To: 53049@debbugs.gnu.org
Subject: [bug#53049] [PATCH] gnu: libaio: Fix cross-compilation.
Date: Thu, 6 Jan 2022 12:30:30 +0100	[thread overview]
Message-ID: <20220106123030.128feae4@tachikoma.lepiller.eu> (raw)

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


             reply	other threads:[~2022-01-06 11:31 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-06 11:30 Julien Lepiller [this message]
2022-01-08 21:57 ` [bug#53049] [PATCH] gnu: libaio: Fix cross-compilation 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220106123030.128feae4@tachikoma.lepiller.eu \
    --to=julien@lepiller.eu \
    --cc=53049@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).