From patchwork Thu Mar 30 12:32:29 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: 48811 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 1B5251715D; Thu, 30 Mar 2023 13:34:40 +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 7D5C717149 for ; Thu, 30 Mar 2023 13:34:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrTh-0001dH-A3; Thu, 30 Mar 2023 08:34:05 -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 1phrTf-0001cJ-3E for guix-patches@gnu.org; Thu, 30 Mar 2023 08:34:03 -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 1phrTd-00020s-Uj for guix-patches@gnu.org; Thu, 30 Mar 2023 08:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrTd-00033R-Pr for guix-patches@gnu.org; Thu, 30 Mar 2023 08:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62544] [PATCH] gnu: tcsh: fix riscv64 cross-build. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62544 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62544@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168017959711671 (code B ref -1); Thu, 30 Mar 2023 12:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2023 12:33:17 +0000 Received: from localhost ([127.0.0.1]:56071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSs-000324-9Q for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:33:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:59658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1phrSe-0002zG-7g for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:33:05 -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 <873216071@qq.com>) id 1phrSc-0001G7-DT for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:58 -0400 Received: from out162-62-57-87.mail.qq.com ([162.62.57.87]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1phrSQ-0001of-8d for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1680179555; bh=Yyaq+ZSF7hvvxRVS7Xj4BhW3tfp9VaVhAebLlBMD5G4=; h=From:To:Subject:Date; b=txesCKhELd2Q1Fg09NL3U0lpONSZM/36spWk47nVp4doH4eXS/kbu2aXh0nkETR90 T1dZ6cwxYqbo0ixIXkto7SfwYRrvJ7JL70t7GByerYgY/tXe1M2zibdyeIkqFLWqXX Y8/cXsAJ2d6ZRGNOScNaZ0yrFB+Wc+va+Wl5Cdxs= Received: from localhost.localdomain ([111.0.51.145]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 81D9D6DD; Thu, 30 Mar 2023 20:32:29 +0800 X-QQ-mid: xmsmtpt1680179549t7gnccwbx Message-ID: X-QQ-XMAILINFO: NkHKfw09D6j8rnIUtE4Qz5Qd1O5N17yoSVd/G2vH1AkDre4ePmNaMJ7Vnh62AA gRc3Do5HwLbyh4/KWPuUAoatGsscdr7JGzOdcuMKiKGid4N4ElC0bye3clHG3ADft4IccGqYDIMA CdzvS6tqt3+xPcqFgVB9z4T1txbMTSAXxKFbSZ8h7CLA2Dr3ur9feiFfYXUimL11TTOd1hZCpLG2 tOH/Dieb7GFNSDsenxt3WVUSnpKeieR3WTZuxDBJU6gnI3IsXGX3mPaeSyVVVR0vVMTH/PWeT527 uFaprKzt5Yxod9a3goEQNBTu56N27SIlc9b2IBlrrbgcGQw/5AUvEv+HoKRUL50dl0d1lJPQpQBX rcBeprww+vNYD5nQNqzA0kirztnjQl674ZlPLUIKQkWP4MEtaegDW53LOGyUTWtgfnkgQfuM5WnM /evusnwLKujjsLZoBRd2LMoG+/MZ9W0dTC/lEN8KqPFDvs6cMARYRY/A0KXS6K8ENQ9OemRoT1ox DiFuwLQwZm5XT+xQXDdBSM1LLuv4hq48RGwDID0t2U3AQOcO2JNTHst0dsMbpm2w4sr6wt2dTtVh +r6tXIpm/DffIOPxroF1roujtirnuc2Ehd8k9cJj9FcxHHydj0MPrf0ClLuV3YbQ5gd/vuEo3FZH RQg0EgMupqIqdXFQoLWkRQbzjfPW5RVewF7O9K4onPctlHQ3mR6s3C83Wm1nHLNaX2IjblgJrk7n R8T43W0bYQT/qzZtsBxCO9kTQocOhnbiq71NW6qF6mH9gPmHihma3smy/AU1o75oS0q8JKxXJYik BQfqMX8IDaA1r8f4RTdRXqjCxZPzQYAbdYJpTaSo8XE24+EBP/vDp+E2qQgaf36XqGNUU7uxi+HF htM2LRJ0B3qil7PKRXbxN5APpPysA+6Y3BAaZN0PGrR344iq+AsjLAUwA2i3OLvQ== Date: Thu, 30 Mar 2023 20:32:29 +0800 X-OQ-MSGID: <35dee10e81ca8bd34f02f372d76ba5b6b1c673e8.1680179545.git.873216071@qq.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=162.62.57.87; envelope-from=873216071@qq.com; helo=out162-62-57-87.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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/shells.scm(tcsh): fix riscv64 cross-build. [arguments]<#:phase>: Add update-config-scripts phase for riscv64. [native-inputs]: Add config for riscv64. --- gnu/packages/shells.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index c2b08afbe9..9c892f4bd2 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021, 2022 Nicolas Goaziou ;;; Copyright © 2021, 2022 Felix Gruber ;;; Copyright © 2022 Andrew Tropin +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -398,7 +399,10 @@ (define-public tcsh (patch-flags '("-p0")))) (build-system gnu-build-system) (native-inputs - (list autoconf perl)) + (append (if (target-riscv64?) + (list config) + '()) + (list autoconf perl))) (inputs (list ncurses)) (arguments @@ -412,6 +416,18 @@ (define-public tcsh "CC_FOR_GETHOST=\"gcc\"")) #t))) '()) + ,@(if (target-riscv64?) + ;; TODO: remove after commit + ;; 3c33503f9aec4412dc1a95927a8c5c357c7b851e or 6.24.00 + `((add-after 'unpack 'update-config-scripts + (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"))))) + '()) (add-before 'check 'patch-test-scripts (lambda _ ;; Take care of pwd