From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id KCfIJGuaaWdPPAEAqHPOHw:P1 (envelope-from ) for ; Mon, 23 Dec 2024 17:14:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id KCfIJGuaaWdPPAEAqHPOHw (envelope-from ) for ; Mon, 23 Dec 2024 18:14:19 +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=ZAsgc8Nk; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=t6dCV8uS; 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=1734974059; 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=LOlqv2vg6Mu6JpY5J5wSYG+U3/Ai0dGn6whE6QEfb0s=; b=kXWowwCtPL07p31nEuw8MTCToSM/Zft4G5fGdMkQ5COlC2S2ZgSeZ30ZixbrLlvMYQX+bX GDQIVBykNavazD2ALod4nblZzvugvsPOe1wa4IBkPaDPAsFfLadfGrDa2CLe0e69TvSLd5 +OjY/z5zrrldkckGShuinCleg4pFkRZ54s4D3JloxNNIGIy5cK15TBf+SLYQsZxtPYu9dG djTthbf2UJP74KBB55cx66mFOaWwdWruJwuKCqn0EbYzgdv+UXCiGhpoKqwE0z9l+ejjPP +fEewCB2X9248YAnnMYpr07wDkWwhrorsZRI1wvBSVqbA8tpfA1OTQ2lHCxGqg== 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=ZAsgc8Nk; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=t6dCV8uS; 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=1734974059; a=rsa-sha256; cv=none; b=IySEaI2l6MgIBaI9u0u/wOq8wrZGgvl/c+KpX3Qmf5mHMiKUcTW0BTEtBmGJkQ1zJx+0/P ychhkOyo56fVOhxi25T6dPm7dR9yOXGxf0f6FpOGtlquAxD7sTmQbiTLJmqTI3R0nDpE5+ Pe23BC0krT1pzx6Zl2KBusgEU0nxbrPs6XOor8gpJ079grliVzk0ViVC1lf0hN2VKxxvm1 tqwuCSW6VKR4QwdxyX+Pnst69iPSYmCncz36g3WgCMIBUjdMDCffiB6L2kNoE0feLMgS8W wIqgVe2FfTctYqomygqWA8xiHB0S+bqi+YFr03H2uWvkFpeukClkaHUhszsTLw== 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 3B16796C85 for ; Mon, 23 Dec 2024 18:14:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tPm0J-0008UV-IR; Mon, 23 Dec 2024 12:14:03 -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 1tPm0I-0008U7-CP for guix-patches@gnu.org; Mon, 23 Dec 2024 12:14:02 -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 1tPm0I-0001RX-2K for guix-patches@gnu.org; Mon, 23 Dec 2024 12:14:02 -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=LOlqv2vg6Mu6JpY5J5wSYG+U3/Ai0dGn6whE6QEfb0s=; b=ZAsgc8NkfAwqZbsJkzXPv9j8OuIishb6zlHKqXwI/+mQvfscAZe9UCnlQae1qE3GgfQVsX8uTMbAMp+kYHKBFkixaH3iJEu6Z+EO8nrOSGSJ6eMa9LJci+oyC/7Kr1YfEbbTyoZUVNP+p8dVDX7A8PDWLFz9uREwVULDQeKlMqjPtx7lw0wQHtXGJMUSuqLRQ5tNGF2Wq3fMj7x5KgkKcUQccv5Tr4wOiBsM9Dhf5Dtj9gdnMMwFwRtlD9WxS96OCMn0RvqEst9C0N5beiXI8nz/dBXTb1wjnjXnKmm2d3owJHTtKvYNCXeZzsNN2NzXG66Lk9f5apuCiuBpyHF0Tg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tPm0H-00081k-Sg for guix-patches@gnu.org; Mon, 23 Dec 2024 12:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75051] [PATCH 07/14] gnu: readline: 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:01 +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.173497398330704 (code B ref 75051); Mon, 23 Dec 2024 17:14:01 +0000 Received: (at 75051) by debbugs.gnu.org; 23 Dec 2024 17:13:03 +0000 Received: from localhost ([127.0.0.1]:55881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPlzK-0007yz-9Z for submit@debbugs.gnu.org; Mon, 23 Dec 2024 12:13:02 -0500 Received: from out162-62-57-252.mail.qq.com ([162.62.57.252]:51791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1tPlzH-0007yT-EH for 75051@debbugs.gnu.org; Mon, 23 Dec 2024 12:13:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1734973972; bh=LOlqv2vg6Mu6JpY5J5wSYG+U3/Ai0dGn6whE6QEfb0s=; h=From:To:Subject:Date:In-Reply-To:References; b=t6dCV8uSpcgbCgNa8eeLMAyuKZihsJluQJp3MGaRJTrqb4BF32XvWYMdCCrE8IxYF ih6OGHvH4jXk3IR9n+ZL9T74baHj20XMagTpxJ2JY6WLS8trQoO+OuUmV+O9MEiJra 8wvaf6/plcH5iorVFCc18VOyCnks7uz6MA+3jcJQ= Received: from m.tailaa68d.ts.net ([240e:391:ebb:8120:ac72:f386:b183:419a]) by newxmesmtplogicsvrszb21-0.qq.com (NewEsmtp) with SMTP id 3332465E; Tue, 24 Dec 2024 01:12:51 +0800 X-QQ-mid: xmsmtpt1734973971tm3eicgrb Message-ID: X-QQ-XMAILINFO: OOO9dHjlsLs77ZUwHSqZJQL0QzOFfXVgyCDk7sgmVI9KGp1x5ouHl4g58iyRdV 2Vs7w9LeuHn7KeQ0OR4YcypCe7jMoaUgNMAJEIBFFpzhsC+wK/PFv9E8qXfrdSYRrabMr6XaxLr+ DwY68Y+WdF88WnnrRPRIu6LKaIHJQERQ7t+lKUAJoQ16p1y5U4jZnlNYggXyI4mUQWnCnyweT0LO HAjm4VrvsthKvZgfbA5cuhPx4OtBGS52mDSxBFi0ytiI6QYVISErpBrX/icHOd+/50H6raFkS7KM ZTWpM7wYesYDSzsOtqIL9hAS9Gy99LR2MceN+CLYhbyJS/OhKpx+q0GP3PhZ8uaplnsEINwPQqsg aGQkckBhfd71R+nfp+WosNR7cCRQbKFNRCM2nPuBx0TAvxLRZMFU9lgVONlcw6UyeXNWGbo+t88M ocV7E9MNb7wnjbNRaOu9lAWRmfAvXJYJ6BLJn36gtEcGJtB2pqAnVdbfFvJgggrcYNnjgo7lSed/ 1mpiSLC05r9PsAiFawhCZMQne0beNGcdQNTTxBr2riqARMKT/YsFt/EZBlfUlH4m1Cq0TvX1wF0Y lWJCQtASe6hJcAG1lLIDikiF4IUh19zh4ISiZxRTbm+eMHLfyVFBzkIi2uKTeAmLACOzZHqPQzZD iDVY0wHiD+jxHrvcAo34d1QUPrrxcgU6Fxhdr3z6YqmMOg46Cdfu+B9pLAT3bWIN2WA7AyvwGkPR ea81h0Txgo5kdyh6mbeQ9LHiWG86Hv3jObeWajfBrjtjhLXHlVY/cQtcrM30FsMXAo6j9F6zWWLW rOgWklR9IuT/XW+Unpzb/qv7nopoKuG7MAPILla38TcVTzd+xwGDuTSlTVoJtDsQhzLkCLXnm7is 5PrduFd2DGKWGkbtbqgra9Ih0+xqzNn0YcdwIMs6/SgNI/fgYn28DI4ROlINEseyEejg/bNZiY8d OEyjh5yxWC+Qiyug9jl2AcdPaGAI32FMTAq3QxjqVigP9mfHXw0A== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= Date: Tue, 24 Dec 2024 01:12:50 +0800 X-OQ-MSGID: 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.01 X-Spam-Score: -6.01 X-Migadu-Queue-Id: 3B16796C85 X-Migadu-Scanner: mx10.migadu.com X-TUID: uBy97Edlm784 * gnu/packages/readline.scm (readline)[arguments]: When cross-compiling to loongarch64, Add update-config-scripts phase. [native-inputs]: When cross-compiling to loongarch64, Add config. Change-Id: Ie369d53c7f2493a7a65fe592a3671719dee264c0 --- gnu/packages/readline.scm | 61 +++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 8200a24f1a1..c19c7326497 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -82,29 +82,48 @@ (define-public readline (build-system gnu-build-system) (propagated-inputs (list ncurses)) (arguments - (list #:configure-flags - #~(list (string-append - "LDFLAGS=-Wl,-rpath -Wl," - (dirname (search-input-file %build-inputs - "lib/libncurses.so"))) + (append + (if (and (target-loongarch64?) + (%current-target-system)) + (list #:phases + #~(modify-phases %standard-phases + (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")))))) + '()) + (list #:configure-flags + #~(list (string-append + "LDFLAGS=-Wl,-rpath -Wl," + (dirname (search-input-file %build-inputs + "lib/libncurses.so"))) - ;; This test does an 'AC_TRY_RUN', which aborts when - ;; cross-compiling, so provide the correct answer. - #$@(if (%current-target-system) - '("bash_cv_wcwidth_broken=no") - '()) - ;; MinGW: ncurses provides the termcap api. - #$@(if (target-mingw?) - '("bash_cv_termcap_lib=ncurses") - '())) + ;; This test does an 'AC_TRY_RUN', which aborts when + ;; cross-compiling, so provide the correct answer. + #$@(if (%current-target-system) + '("bash_cv_wcwidth_broken=no") + '()) + ;; MinGW: ncurses provides the termcap api. + #$@(if (target-mingw?) + '("bash_cv_termcap_lib=ncurses") + '())) - #:make-flags - (if (target-mingw?) - ;; MinGW: termcap in ncurses - ;; some SIG_* #defined in _POSIX - #~'("TERMCAP_LIB=-lncurses" - "CPPFLAGS=-D_POSIX -D'chown(f,o,g)=0'") - #~'()))) + #:make-flags + (if (target-mingw?) + ;; MinGW: termcap in ncurses + ;; some SIG_* #defined in _POSIX + #~'("TERMCAP_LIB=-lncurses" + "CPPFLAGS=-D_POSIX -D'chown(f,o,g)=0'") + #~'())))) + (native-inputs (if (and (target-loongarch64?) + (%current-target-system)) + (list config) + '())) (synopsis "Edit command lines while typing, with history support") (description "The GNU readline library allows users to edit command lines as they -- 2.46.0