From patchwork Tue Feb 28 08:33:35 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: 47481 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 378C516C38; Tue, 28 Feb 2023 08:35:47 +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 854EC16BFB for ; Tue, 28 Feb 2023 08:35:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWvRw-0003gi-UK; Tue, 28 Feb 2023 03:35: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 1pWvRu-0003d4-RD for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:02 -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 1pWvRu-0007W8-Gj for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWvRu-0005RV-Bu for guix-patches@gnu.org; Tue, 28 Feb 2023 03:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61865] [PATCH 3/8] gnu: libxtst: 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: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.167757324420785 (code B ref 61865); Tue, 28 Feb 2023 08:35:02 +0000 Received: (at 61865) by debbugs.gnu.org; 28 Feb 2023 08:34:04 +0000 Received: from localhost ([127.0.0.1]:49634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWvQx-0005P6-TO for submit@debbugs.gnu.org; Tue, 28 Feb 2023 03:34:04 -0500 Received: from out203-205-221-231.mail.qq.com ([203.205.221.231]:39048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pWvQm-0005NA-Hx 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=1677573223; bh=HdHWSHCB0yle28JiP50GpIL913eeOlckSPEB49WiCOc=; h=From:To:Subject:Date:In-Reply-To:References; b=nBokacboFlWU622bf2E67fk6Z/mlgRocdNc44hz1xv5CrQzjfa9G5cEpqSLGOHbWs e4iI2fIFNHCr0uZVLi+f0ISFna70woRs8PRmym9BD/ycY1O2RyxKhfj6ZsRPuNIcOv 76lZ9gENMqeUpVWhmOJMSYjAgDhdAKHahNESqJ4I= 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: xmsmtpt1677573222ty8v5nud0 Message-ID: X-QQ-XMAILINFO: MxEfoLnXvBKIN2MGvnmcRwXDAhUM7zRoV0xFr/Ew+1FfiUDGJ+6dPMBflJsqTl q/HVZkxighWPnBi5iIcgFuNrJX13wtNooXm3p1mUO7aGS67/EOyrxymzsC6kTdtwZnlX3ssc2/w6 TcYrrikLboufHZGltfh/ayzu2OzkEonH7sv3413p/EJhlX9Jwi7JKViooUXRoP6JGGysFxfbIRtB zJP6zs1IjdYSu0QPAteIEUwo5FNJ/2B7hicYLnXEFjtG/zcGjn/zWTQeFab9/NEQRu8fX/QZhy05 a15LGiH1Way1T6hKTL/BxV/zK6F2W8xKuj52wHhVXxlyOLPPExB4m3OXvcqLdYQTRwC3Aa+jTMpR qrUmTNggMjm5Xofo8mrenu4s5lzBb2UtcSC1OTuiaWMv+aqjqnfoUtLHlLVMsYBXVF+QYtiubBM2 IPrfD6QJCHR694w9/ul+P0WiOdEgBt7We3WOzQFqklb/zq7kAO5qwqshSWAvuFYM5xZsb2CrSQBB zSpyVBc1KyHyqbjWkZE0gUR8CN624V7ewL4YsFXm2IFNEG86UOHwpX8PTBzWO3Q1PUdE7I3d9jVe 8wc5yr6le5b8hpCdej0ez4KyNzm8QUV7AmiQ4j7wQOafwCnNLVhuGD7ggl0Q4Cu46f+Uz1Ff+Oy9 4FU5abx5b8gtxuh+1g6eQ1Ig1Cv5E0H7J9zk9U2nFxoN0if4uaAKUVtAMKRBDkYjUYkfqSAoqn6V 9dfauDMlEJ5zSDWi9cMDwvAnQtVleI18052w6tUr7ZHcSCqaG+v3+lcKa0oE889CwnWWb9RH0yqt y0UM9hJapaNm7H8W52WavEcr7U/18pGU9lDvHPOeITWqqOs/BRDgfDvRl59GDpRhfGkgAtyeRNHi eb6vp8YWZb2iV/QYnTRJR1249Lj9hCJLpkKWakrcX4cvV8/a+fXi2iNBlBF+EmtxJMrvJ0aCs2jr eKslLS0PAKYBsUkPsR8FltlJ0uWHXo Date: Tue, 28 Feb 2023 16:33:35 +0800 X-OQ-MSGID: <2d502dfea24e8d1d6b45c0cea84d10f64c5746ff.1677572541.git.873216071@qq.com> 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(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 | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2b6f9fa369..2cc1523e3e 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4658,13 +4658,28 @@ (define-public libxtst "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + `(#:configure-flags '("--disable-static") + ,@(if (and (%current-target-system) + (target-riscv64?)) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'update-config + (lambda* (#:key native-inputs #:allow-other-keys) + (install-file + (search-input-file native-inputs "/bin/config.sub") ".") + (install-file + (search-input-file native-inputs "/bin/config.guess") "."))))) + '()))) (propagated-inputs (list libxi xorgproto)) (inputs (list libx11)) (native-inputs - (list pkg-config)) + `(,@(if (and (%current-target-system) + (target-riscv64?)) + (list config) + '()) + ,pkg-config)) (home-page "https://www.x.org/wiki/") (synopsis "Xorg library for Xtest and Record extensions") (description