From patchwork Tue Feb 28 08:33:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 47478 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 F008616C35; Tue, 28 Feb 2023 08:34: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=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 C672216BF5 for ; Tue, 28 Feb 2023 08:34:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWvQy-0002KP-CT; Tue, 28 Feb 2023 03:34:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWvQx-0002GM-25 for guix-patches@gnu.org; Tue, 28 Feb 2023 03:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWvQw-0007QS-QR for guix-patches@gnu.org; Tue, 28 Feb 2023 03:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWvQw-0005Oj-LP for guix-patches@gnu.org; Tue, 28 Feb 2023 03:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61865] [PATCH 1/8] gnu: xcb-util-wm: fix riscv64 cross-compile. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Feb 2023 08:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61865 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61865@debbugs.gnu.org Received: via spool by 61865-submit@debbugs.gnu.org id=B61865.167757323720717 (code B ref 61865); Tue, 28 Feb 2023 08:34:02 +0000 Received: (at 61865) by debbugs.gnu.org; 28 Feb 2023 08:33:57 +0000 Received: from localhost ([127.0.0.1]:49626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWvQp-0005Ni-Qk for submit@debbugs.gnu.org; Tue, 28 Feb 2023 03:33:57 -0500 Received: from out203-205-221-155.mail.qq.com ([203.205.221.155]:60951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pWvQm-0005NC-Ca for 61865@debbugs.gnu.org; Tue, 28 Feb 2023 03:33:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1677573222; bh=UEoqgaQpnsm459reyHf7ptP9dREjbqLc18FDLUlLkCE=; h=From:To:Subject:Date:In-Reply-To:References; b=eua58//Jz1iM1GZF76JUKlbUDsdnRwLrhDBmGTP2bUdxq3KgrjV/30Fza/tes+31q RcjF1YuXqxYoGa3CAVVqajSMw3JX7CQrxJ3NL2UPUrcZavWBk/GHEN6CVIhqL6jcyU EAxtN2BoZCWLKRMteALD324R9Ad8mJCJP633uFeo= Received: from localhost.localdomain ([111.0.51.52]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 868856C0; Tue, 28 Feb 2023 16:33:40 +0800 X-QQ-mid: xmsmtpt1677573220tsx1kf73n Message-ID: X-QQ-XMAILINFO: NN7gBCxAqYgU8tgiJn52YIVMMlvLaBs/3TgNLL4/9BRoqeLWnT9PCGw5dSLqX3 4pLRspPSacwZZGzsQeUcolEBDRI069dgbwt/Vgwos8XhE01O2gcM6PtZHG1rgPQucBCDY8wTTmyt 4dLSbvJxDHtVTzUVkJHpTwmT6wS67aEPgWymr6ysci11sJuO0o3B8/NSgwpNCzjK9/JH5Ad8kjJu v3Br5uVP631gL+KemAqTXmxnG/mIwWfTkJZ7+rXU20z2GM5/tDSlp3FLWPi4dbHOYicDmY1stD6k n7XpzL1UBjrCfqvAMciGkAEvpAgpOYqf0wVr+r0cDxW7ToJfyUvUHr9+OGfUD6t/fu9kYs/ow/iG Hue/5bqWCLnsGVp5bjSCxUxfVh3ilsr+HOv9u30ZW3Tfs91FabOveYhJOp7hEx42L8hPNP8M6mvz te7aS7HgJnedtQTgAsEIogqASJ8StYMKqautOXe/uwaksNzGTU7KYVvQoVDXaeTPOH2/MhspxTWV MUX4p12e8mkomcesZA3NDWBRvXATIYmpbnF/8yFOv1vCwvev1KkE+hHV2PMj73b36WznVtPdbjwm jafKvtyhyl9ifAHQ+nhW7KkdpQMv130fdCqaAtU36u/p676HBNJWCX72Ft9t3FaWhCs6p4k5m+WR LsMg1f1IgRNv0Cg+pyHxNcs/RHmVCVcqdLbF4ZuRZ0JNWLm7pWcKxxcgUXgdZork8xn3N3+WrcL6 6v1s+IhfbvJpfyocHyYwOmsm+EgLGVCVEh+ngoXSwtDqPyhbNKNUj5IuJGxN5QVsgvg59mRRgmPq gW4TxAY7oMaVSRrM+tybG2E0F4ddQmRNJSBISOLglJAYb9zEcIWowkd9ptKSED40A+Ge84WgVMOh aZwqxpwyosPTe6vqVIZ60Fmm/9BmRJbbzaaAshCOnWqzP4ai4ZagDIOlCA8StK0Q== Date: Tue, 28 Feb 2023 16:33:33 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xorg.scm (xcb-util-wm): fix riscv64 cross-compile. [arguments]: add update-config-scripts phases when target is riscv64. [native-inputs]: add CONFIG when target is riscv64. --- gnu/packages/xorg.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a43809e3cb..32be732eef 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5792,11 +5792,27 @@ (define-public xcb-util-wm "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags '("--disable-static") + ,@(if (target-riscv64?) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.guess and config.sub. + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")))))) + '()))) (propagated-inputs (list libxcb)) (native-inputs - (list m4 pkg-config)) + (append (if (target-riscv64?) + (list config) + '()) + (list m4 pkg-config))) (home-page "https://cgit.freedesktop.org/xcb/util-wm/") (synopsis "Client and window-manager helpers for ICCCM and EWMH") (description