From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 30 10:46:26 2023 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= From: Z572 <873216071@qq.com> To: 61865@debbugs.gnu.org Subject: [PATCH] gnu: libxtst: fix riscv64 cross-compile. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 3.9 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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/pac [...] Content analysis details: (3.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (873216071[at]qq.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [162.62.57.49 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (873216071[at]qq.com) 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 3.2 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr 1) X-Debbugs-Envelope-To: 61865 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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/pac [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [162.62.57.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (873216071[at]qq.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (873216071[at]qq.com) 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 3.2 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP addr 1) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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 -- 2.39.2