From patchwork Tue Feb 28 08:33:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 47485 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 A763E16C2B; Tue, 28 Feb 2023 08:36:00 +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=unavailable 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 3F64F16BF5 for ; Tue, 28 Feb 2023 08:35:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWvRx-0003h8-FU; Tue, 28 Feb 2023 03:35:05 -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 1pWvRv-0003eb-W0 for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:04 -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 1pWvRv-0007XE-Cl for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWvRv-0005Rk-7a for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61865] [PATCH 4/8] gnu: mtdev: 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:35:03 +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.167757324520800 (code B ref 61865); Tue, 28 Feb 2023 08:35:03 +0000 Received: (at 61865) by debbugs.gnu.org; 28 Feb 2023 08:34:05 +0000 Received: from localhost ([127.0.0.1]:49638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWvQy-0005PJ-Mf for submit@debbugs.gnu.org; Tue, 28 Feb 2023 03:34:05 -0500 Received: from out203-205-221-231.mail.qq.com ([203.205.221.231]:49571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pWvQn-0005ND-2I for 61865@debbugs.gnu.org; Tue, 28 Feb 2023 03:33:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1677573224; bh=jzRAIVHAkxmgr7AUil+WJRM/PWnbLU2Db+iharo6bzE=; h=From:To:Subject:Date:In-Reply-To:References; b=bmgidJB9HWxaGhOMbEpUxZlK6v9yJSooUffskbydpz8TiiISKoMUdV1DqwlzobxCF 26biSLUuEAvSyZs8EsUSsrb8vAWoqQFVpu7PKI6VZN6A+jwUM55N9AAe+LlfX+NSoe hZrWkSdt4fYpCzbwQhHvEEUgBwtMnjYMYQgKOwNA= 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: xmsmtpt1677573223tcbp1a385 Message-ID: X-QQ-XMAILINFO: OKkKo7I1HxIe+PMPAgfWOO5daDVU7F/BQAutb2u1iAsMjxnqBkgCRpY+xCW9Pt 3yT+gsTuX13tlOL8uSljRXzzkizfXmv19IvgoMHQ3D8j7GRold/i2/uyrUunAOUYXBj6dqR6b84e luHju3PSScZCvH8bef79cnjOcZzP3k8A3WgbrrfqY9CrKxyf+dMiIXS7dxLam/QJrqgVR7OjgN1Y LorZMUVjd4mUWD1R5VKFWyCwwq4X+lh0EUSBQp6a3JPOk28P0J0Vxbtqa581gytdgbJk8NIE84GE OYApo7i5ZMiZTo0cptTAo6lmabgYI7MX05cNI+JKird4fPHADdMQC1/ooY72HCF8+xdvqwnulCPP xmuZx0GqbUsIx3M2VeSnWcgoWYLvFS0LXXk0qEM5kxUlBO6qwhfCoYuWsYKNAnThbutwErtOIHiV pfNLlKs8smWQroxmembrRINWpr2+uSxIOQKy6o0n7lQ3jTe0fdZtgzdARBauat0h08K7QplpCOBo aFy1EaZGKhvsmWSFptzutGBBqedwPi/rtCqjAlGu/XQhKnTyoDpqumscc35akve2nXM2VVZmLFhO QUQSx3QP6nE6M4+FvA4JvMlIi75TtqPDg6xN9L1ypk3Xfk4V7WOQsnEOtyqEQHm7kWfg7PPlK41U ZKDjEZLzrxvjTTQBxrMQQ/jgPjDHAqrHQ/8d2NuQ0Tl/YuhJicXYlXoaMh3Av/bsdioUHEK/a55q KxyRO71BvnvDbSdBrHe7OfkpVw3bFZG1Z2M8S6V9ZpGWdBXM+y5ezTwJDYD9AkKnxPhNkLDZBjem AAiNRvYAayYGXbwIk7WhGHadixrOWz2gWoeePqBy28HTf4dMl5Gu3cyPLS1wZ6hA+XRNk5OwUYP9 Hwb3OflMLe2Vlnd5GgvYads3XmMu6D9+kDcD6wAQh6K+AucR9GLNqRT4FaswGXRuHAHZZREQRu Date: Tue, 28 Feb 2023 16:33:36 +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/xdisorg.scm(mtdev): fix riscv64 cross-compile [arguments]: when target is riscv64, add phase to update config.{guess,sub}. [native-inputs]: when target is riscv64, add config. --- gnu/packages/xdisorg.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2ebeb4e013..21bc368538 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -41,7 +41,7 @@ ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2020 James Smith ;;; Copyright © 2020 B. Wilson -;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2020, 2021, 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021, 2022 Nicolas Goaziou ;;; Copyright © 2021 Xinglu Chen @@ -763,7 +763,23 @@ (define-public mtdev (base32 "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm")))) (build-system gnu-build-system) - (arguments '(#:configure-flags '("--disable-static"))) + (arguments `(#: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-aux")) + '("config.guess" "config.sub")))))) + '()))) + (native-inputs (if (target-riscv64?) + (list config) + '())) (home-page "http://bitmath.org/code/mtdev/") (synopsis "Multitouch protocol translation library") (description "Mtdev is a stand-alone library which transforms all