From patchwork Thu Jan 6 11:30:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35999 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 18C1F27BBEB; Thu, 6 Jan 2022 11:31:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C437427BBEA for ; Thu, 6 Jan 2022 11:31:27 +0000 (GMT) Received: from localhost ([::1]:58412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5QzO-0007L0-WB for patchwork@mira.cbaines.net; Thu, 06 Jan 2022 06:31:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5Qz0-0007J1-By for guix-patches@gnu.org; Thu, 06 Jan 2022 06:31:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5Qz0-0005Pa-1E for guix-patches@gnu.org; Thu, 06 Jan 2022 06:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5Qyz-0004Cr-OZ for guix-patches@gnu.org; Thu, 06 Jan 2022 06:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53049] [PATCH] gnu: libaio: Fix cross-compilation. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Jan 2022 11:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53049 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53049@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164146865116150 (code B ref -1); Thu, 06 Jan 2022 11:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jan 2022 11:30:51 +0000 Received: from localhost ([127.0.0.1]:39791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5Qyp-0004CQ-Hl for submit@debbugs.gnu.org; Thu, 06 Jan 2022 06:30:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:59910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5Qym-0004CH-9G for submit@debbugs.gnu.org; Thu, 06 Jan 2022 06:30:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5Qym-0007CE-4K for guix-patches@gnu.org; Thu, 06 Jan 2022 06:30:48 -0500 Received: from lepiller.eu ([89.234.186.109]:37742) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5Qyj-0005Nv-Sq for guix-patches@gnu.org; Thu, 06 Jan 2022 06:30:47 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id bf1384a8 for ; Thu, 6 Jan 2022 11:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:subject:message-id:mime-version:content-type; s=dkim; bh=6AV MRQKIXn00VSj1fh7GkLU2vchXISwCEBgCfam3ORs=; b=UePpIewH5EkvbjGO05T Z+9x8NRQKUM4Vbc6IgW8SvKsnkDdSwPSig+T3A88EngLdGAelrhMyCYsC0xXOIdZ Fo3zGb6W24Md1aavMf9EWRiJsiN64AoXaXxoBPSJ+WdT7bY9my01OLbRvUW+VROP fIT8PdjKuoQVGOxWGrmViv/IMAHG+ZGh0A03IkFYLm4fv3eWumltzhBZ4W1J/1fc Y5XsqO6zwaZ/Cy5Qr8KTp5dOMPn4rocMvkLXVFMr11JptTm5FI7ITFnp/Fb8KZ6I mQ5rkFLUUaGzNP+6ho9w7Q2Kvc4k29a6Yw+cXS1Kd6b2yFWbNMd5Oj9745bzcyww ufw== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d34ae55e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Thu, 6 Jan 2022 11:30:40 +0000 (UTC) Date: Thu, 6 Jan 2022 12:30:30 +0100 From: Julien Lepiller Message-ID: <20220106123030.128feae4@tachikoma.lepiller.eu> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Received-SPF: pass client-ip=89.234.186.109; envelope-from=julien@lepiller.eu; helo=lepiller.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. From 160572309d022b4249cb41296864a0e1c32eae0a Mon Sep 17 00:00:00 2001 Message-Id: <160572309d022b4249cb41296864a0e1c32eae0a.1641468451.git.julien@lepiller.eu> From: Julien Lepiller 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