From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WCjPLXOaaWfpZQAA62LTzQ:P1 (envelope-from ) for ; Mon, 23 Dec 2024 17:14:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id WCjPLXOaaWfpZQAA62LTzQ (envelope-from ) for ; Mon, 23 Dec 2024 18:14:27 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=ijKAaJzJ; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=mcQ2fT4t; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734974067; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=p8rHJTKpXm/sXZM+yP8eXk3yFE7EHMtcupQY576YpxM=; b=s/3KD4AN7RyNhNJHOhv1EK+QlsRjXfFyeDih7kEtUgQIOz+A2/NqHa4kyrSV1dJYLZzTUS EpfFaYAccdI+nRlgTS/Ao8lhai4wrUWHWbSumRcULg17CuyVuGvwfFWEwhbPtwywxgfHQz jmJ875QA8qUWSxBdNZZRYDDXmd1w0rmmf2IrIhTBxRrrLFeKaXHcPDy7kAuZCTWtWErwbN WgOQ4YyM5A1W6cYRtb2FH/CRbwEBHNkW2P/A9OznPPkUyEZLjNb3aYThszIe+Pdo3b+ujX QzJsdre3i/YSKC92rP2tsv5GBFjQI4aOUqtDDpivkwlbcQMEMvtDMS79StA1Yw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=ijKAaJzJ; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=mcQ2fT4t; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734974067; a=rsa-sha256; cv=none; b=J2kRvs5jrmQeLQ6kuFS+pMlqD4+XL4KBXatKGNllme0Il10WRSL4Xb1jjJyt4+N3DM49ah 8fNZUnX0x1oGOXbmvkEK8uKhaGUVb4hpA+sggLUDGmQYkqoZqvh73RRQXm9sm3Z9JZLmAM i0fAaqML4RJ2QCbdImUiMOMbvSuc8zqVk7cH556Ld1YM5IM9NIpComBSjcwf6j4MXJjTaw v/oJZJGyYd/bHiNqVG2Z57+OrRfNlkOjdtaEXfA03jgZsI33FriYWkbo0+zui2fQGKAPpf pcS56WRKfAc8iy+wiHhHjH9xWZmgprKPGly8dqQyawnp7/jN5pwj5we6fmT0Sw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7CD1835F19 for ; Mon, 23 Dec 2024 18:14:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tPm0M-0008Vn-9v; Mon, 23 Dec 2024 12:14:06 -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 1tPm0J-0008UY-Pa for guix-patches@gnu.org; Mon, 23 Dec 2024 12:14:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tPm0J-0001Rz-F1 for guix-patches@gnu.org; Mon, 23 Dec 2024 12:14:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=p8rHJTKpXm/sXZM+yP8eXk3yFE7EHMtcupQY576YpxM=; b=ijKAaJzJYBqbdwKy7AMZWcw3ocKfTbDXohvC2uFWWQzdG1TALAn9OTXN4V34zNm6I3Pokuj22KSho/JvrEMwrvWrz/JHp8pYk2E0y8O0td4ByAojhs2WzaA6Z54N9JrJqc4FywoJFOJeNg+vdhoRGPypk+eosG13ynUT33/EZBszLxYq7Gwkx6QLycDtJV4bM/sfr9YrV+HfLlZpIKKmOe8VTKWI4FUNnuM+gKsrdtPVgkR0gq+tu/2sgp8SFQa1xEci4GMrWxsN5KTrKD1rLUnJV0kQn1i9p3wDB8P3d/AIdNlgRqjmuVyK4/IGMOcWlRv2dH/EC+RfIVjyAYjIhQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tPm0J-000827-9c for guix-patches@gnu.org; Mon, 23 Dec 2024 12:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75051] [PATCH 10/14] gnu: bash: Fix cross-compiling to loongarch64. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Dec 2024 17:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75051 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75051@debbugs.gnu.org Received: via spool by 75051-submit@debbugs.gnu.org id=B75051.173497401330784 (code B ref 75051); Mon, 23 Dec 2024 17:14:03 +0000 Received: (at 75051) by debbugs.gnu.org; 23 Dec 2024 17:13:33 +0000 Received: from localhost ([127.0.0.1]:55890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPlzp-00080S-3t for submit@debbugs.gnu.org; Mon, 23 Dec 2024 12:13:33 -0500 Received: from out162-62-57-49.mail.qq.com ([162.62.57.49]:57311) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1tPlzm-00080A-1o for 75051@debbugs.gnu.org; Mon, 23 Dec 2024 12:13:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1734974002; bh=p8rHJTKpXm/sXZM+yP8eXk3yFE7EHMtcupQY576YpxM=; h=From:To:Subject:Date:In-Reply-To:References; b=mcQ2fT4tXWQm0yEGm8InQulMYVdOgCXJmXMxuG6eF/Uf9hoeZ3ctvkiMd9rXwObuW 42zD+4ZjlWW3ZLA1/89WinU7mmM5ZLChacmHdPZxpSYE94VHqaUhy7kl+BZh4dFRP5 FOxioq3zocnD4pOW3YRUDwYHTLd1nsUfxaucmW+s= Received: from m.tailaa68d.ts.net ([240e:391:ebb:8120:ac72:f386:b183:419a]) by newxmesmtplogicsvrsza36-0.qq.com (NewEsmtp) with SMTP id 354B4C23; Tue, 24 Dec 2024 01:13:20 +0800 X-QQ-mid: xmsmtpt1734974000tunps17oj Message-ID: X-QQ-XMAILINFO: ODafEzNm5ExjOljg+fXQQ7yM6zSBTwtDaqxz0yLAoMGzHJ2xzPm+9RZoMNhviA h8Rc3u6qG7gJZrOIafoj2YhcIbzJiW/iEsk5EEQ7ALp4PS993kDhDY4/jaXS44k8qdnDMQbmBrJ6 lXGBqWkoTzpjCvtMORX0ZS3RYsQXV92A98XKKjCpLDnAw1a1y2vRYjvp04/4qrhlRsk6TtKpUhdG sYJBzDQ+P2U7Cx3VKAp4zU9WQ7Xysja7esTI9UIDTub9A7IC54FYCnFaheywc0pQYTomXNGgDvZ5 d4zqt9FHZ+Hc14ZJALEzlxcSvl2huxWSRmOitz6cL2P5IJ+ip6OUVmdBFuX9WuQxS5P+hMJHxC3L gHOWRPiOfTQDeJPfbQJxdUi9XybJlByf+h49cDPI7nNyGIipAG9OBk4E12563C4pdrfklMQbZ8O3 XhZ3pXY0yT2dBGm8DRD3M1uhTbOzo1h2FY2R7gHKWkAQJBdqZFhtsw15jTDr33LVjnR9ZtsSA3nh v4SRuDM2te0BcT28PlsNhmkzhe1GXTe75qfuBfOabKEqlnJ5vi6GH2fIyhSXpoDu57lySLKiLJTr SDqyuTlQSfbo3VxnaQSLPXih7gTe7yC0MAsM7FYsRGZRIeC9WVt0bRyqlLkcLiabpTScVSFfkziM 7v6Bxja2ZQGFycyY6VmxlhPPN52o04WCj1THUsIHyg9Zd/VGop3GV2HLmY2PFlrap1Exuqr+X6NA t6xY69u6NWSTUsGR/+R7CjxzndTvVwMI1aoFMMOeXFdFMtrYZhoikgXvv+x5eueNNTblhJ5tcrex 1mPLKoMX/wKTVsxnulU8YdlFz+GQJfYpqTBBzID8kdG5RdaszSE4Dk3rE9qbhWoSZECqAm7jyTbu iIHpnkvNxc7wn8/1d/llpoDiPmE8l+xLw3I44aYmS2xzSMWXejJR6rIdTrl6tpDzkWYY2rdQ5pzx 1Q8hdQnDyPEhbZUN2+x9She6ZSyL3/9AJcDSB/MvfIOTjA34aXHzERuaDUuoPd X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= Date: Tue, 24 Dec 2024 01:13:20 +0800 X-OQ-MSGID: <66e1cb1f999048f0ec7550d48c4025721172f696.1734972657.git.873216071@qq.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches From: Zheng Junjie via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -3.01 X-Spam-Score: -3.01 X-Migadu-Queue-Id: 7CD1835F19 X-TUID: jP6GRr25Ptk9 * gnu/packages/bash.scm (bash)[native-inputs]: When cross-compiling to loongarch64, Add config. [arguments]: When cross-compiling to loongarch64, Add update-config-scripts phase. Change-Id: Icadaace85a62582fcb0724dda8f5067d22257cd6 --- gnu/packages/bash.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 642a4059852..2d30af046ea 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -28,6 +28,7 @@ (define-module (gnu packages bash) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) #:use-module (gnu packages compression) @@ -150,6 +151,10 @@ (define-public bash (outputs '("out" "doc" ;1.7 MiB of HTML and extra files "include")) ;headers used by extensions + (native-inputs (if (and (target-loongarch64?) + (%current-target-system)) + (list config) + '())) (inputs (list readline ncurses)) ;TODO: add texinfo (arguments `(;; When cross-compiling, `configure' incorrectly guesses that job @@ -219,7 +224,19 @@ (define-public bash "/Makefile.inc") (("^INSTALL =.*") "INSTALL = install -c\n")) - #t)))))) + #t))) + ,@(if (and (target-loongarch64?) + (%current-target-system)) + `((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)) "./support")) + '("config.guess" "config.sub"))))) + '())))) (native-search-paths (list (search-path-specification ;new in 4.4 -- 2.46.0