From patchwork Thu Mar 30 14:46:03 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: 48820 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 4553E171B3; Thu, 30 Mar 2023 15:47:20 +0100 (BST) 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 D53791719C for ; Thu, 30 Mar 2023 15:47:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phtYT-0001eY-1Y; Thu, 30 Mar 2023 10:47:09 -0400 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 1phtYO-0001e2-2C for guix-patches@gnu.org; Thu, 30 Mar 2023 10:47:05 -0400 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 1phtYN-00071w-Ab for guix-patches@gnu.org; Thu, 30 Mar 2023 10:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phtYM-0001L8-GV for guix-patches@gnu.org; Thu, 30 Mar 2023 10:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61865] [PATCH] gnu: libxtst: fix riscv64 cross-compile. References: In-Reply-To: Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 14:47: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.16801875865105 (code B ref 61865); Thu, 30 Mar 2023 14:47:02 +0000 Received: (at 61865) by debbugs.gnu.org; 30 Mar 2023 14:46:26 +0000 Received: from localhost ([127.0.0.1]:59189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phtXl-0001KH-RC for submit@debbugs.gnu.org; Thu, 30 Mar 2023 10:46:26 -0400 Received: from out162-62-57-49.mail.qq.com ([162.62.57.49]:44291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1phtXg-0001Jt-8W for 61865@debbugs.gnu.org; Thu, 30 Mar 2023 10:46:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1680187567; bh=it/G3XDNJNi/SaU6IAyu5k4sNobmlPwDYFdSljRlW/I=; h=From:To:Subject:Date; b=Ix9vL5gKrjLQGArf4m5dV7RLTmM9O6kwmFOZHi+XfnarOYvU+xhWRl2SKPRxL9Hyz lTg2Z0GT8kvqWtbiIOMKJUtXcFzEq0wQycPEPGiyrI2TUC8ntXwGBoyfM7oy7rsWMH VWPJerWkbpqcL9+XYkdAZlFLmYdR50pOIQvMQQGQ= Received: from localhost.localdomain ([111.0.51.145]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id B850D8B0; Thu, 30 Mar 2023 22:46:05 +0800 X-QQ-mid: xmsmtpt1680187565t648zj5bi Message-ID: X-QQ-XMAILINFO: M5Jk7qYLFVj1Z18Nr1C6kaB5a5N8nkZEGJLdmHwxq08mSZ7556Q5SgFmMMKAX4 WnxPTBTce+iGlJtbI4lb6V0NknKcuOuqkpol4y4dRwp8HfszxNuA57nUwoictE9QnnXIYm2LO3xc ERIErO+taInD42Sz9LCIQ2MXxSdlQbuHKQ73zKPc8ZKLH2Z8B76fygpi6EPMqLeuxEVW6RKsOLUY vT+GDtnfDOhNDyMqbnkjR9+BBRpbJgjS9bDhvzz6a37SQviA3djn8pLqmx3zBit6lhWnOBNob4F7 jDPHCH16DI8tEzlopQusxvng2TY8PRBstOUvC82XUWXc3Sa8l5CIaJx77+cAX+dCf0IDBLX+3JLn FJJJz3hNu9/NECCyG48nKBV8ARJXMViyS0h58KG9ihb+DDYcx68jz5YQy9jP/cft+tZNRC+tsOon z2j30QsZP0eg6CvFYaqzdEeCKqzNrml/RKDsml5sWVBemf+yEAmeuqpZjTUpxnVPJEl6VnhtzH8W CC1blicYcizyCp0jC+pOYIQW5yixCtUpVN5Ahi8NKANjbfDQXzDCr7rf2DjK/pntVJx9zrOHQ3dN 9Sgctx6NzUDlAJqqO/uOmsuwVxxFc/Ar4Yv9eZU6AKe602gn9g6995R+uEitxns+9ChjrK2fYEiL B69IJd/P8vibRh5Ah4VoZ52eEcVypgDd7BVl6/nnabYFepgvYJkqzMrg4eXV9qSDkB78MaKQTpNY StXaZzSOviHjxPSsfMsDnW5YxUPD5ZXvJfGNYHFHBlGPmSX9KN3GQiR0W11ee8jB/XJxtqw2IVSO 1MdXPEogcHQ8/LtpKH7mZSP9VOMwUw5CvkqoT93LODTNYP9V8LclLZvFHy1XQKhVVb7ppxXqhvws rPjz7r8KHEVnDmb7tVa3RH5v2/11jfVSHZuldfXBDtycoqnAyKabQ= Date: Thu, 30 Mar 2023 22:46:03 +0800 X-OQ-MSGID: <5e9cb2ef0c3a344255cd5a2845a989545551765c.1680186141.git.873216071@qq.com> X-Mailer: git-send-email 2.39.2 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(libxtst): 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/xorg.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 55c9b53e1d..7d5e7c6f9c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4509,13 +4509,28 @@ (define-public libxtst "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6")))) (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 + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")))))) + '()))) (propagated-inputs (list libxi xorgproto)) (inputs - (list libx11)) + (list libx11)) (native-inputs - (list pkg-config)) + `(,@(if (target-riscv64?) + (list config) + '()) + ,pkg-config)) (home-page "https://www.x.org/wiki/") (synopsis "Xorg library for Xtest and Record extensions") (description