From unknown Fri Jun 20 07:13:13 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#53503 <53503@debbugs.gnu.org> To: bug#53503 <53503@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Add %final-inputs-riscv64. Reply-To: bug#53503 <53503@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:13:13 +0000 retitle 53503 [PATCH] gnu: Add %final-inputs-riscv64. reassign 53503 guix-patches submitter 53503 Efraim Flashner severity 53503 normal tag 53503 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 24 10:20:13 2022 Received: (at submit) by debbugs.gnu.org; 24 Jan 2022 15:20:13 +0000 Received: from localhost ([127.0.0.1]:45367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nC18Z-00021M-4V for submit@debbugs.gnu.org; Mon, 24 Jan 2022 10:20:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:41598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nC18V-00021B-TW for submit@debbugs.gnu.org; Mon, 24 Jan 2022 10:20:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC18V-00005r-OM for guix-patches@gnu.org; Mon, 24 Jan 2022 10:20:03 -0500 Received: from flashner.co.il ([178.62.234.194]:39440) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC18T-0006kt-Ki for guix-patches@gnu.org; Mon, 24 Jan 2022 10:20:03 -0500 Received: from localhost (unknown [31.210.177.79]) by flashner.co.il (Postfix) with ESMTPSA id 27E9C40455; Mon, 24 Jan 2022 15:20:00 +0000 (UTC) From: Efraim Flashner To: guix-patches@gnu.org Subject: [PATCH] gnu: Add %final-inputs-riscv64. Date: Mon, 24 Jan 2022 17:19:26 +0200 Message-Id: <684a9e686ef9d8d326fefb4de794bd661fab564f.1643037303.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Efraim Flashner 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: -0.0 (/) * gnu/packages/commencement.scm (%final-inputs-riscv64): New variable. * guix/build-system/gnu.scm (standard-inputs): Use %final-inputs-riscv64 when targeting riscv64-linux. --- This is the final piece needed to make hello (and most other packages) build on riscv64-linux, when offloading from a non-riscv64 machine or when built natively. Commit 94c70b5440334c7c844e20350351bd5565aff137 from the wip-riscv branch only worked when building natively on riscv64 since %final-inputs is sourced first, then the actual system it is going to be built on. I believe this is due to the lazy resolving of (gnu packages commencement) and %final inputs. Due to the above I was unable to start from the commit on wip-riscv and use parameterize to override %current-system, since by the time that part of the code was reached %final-inputs was already evaluated. gnu/packages/commencement.scm | 6 +++++- guix/build-system/gnu.scm | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 26769d2626..96d914344d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver -;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2021, 2022 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020, 2021 Marius Bakke @@ -3736,6 +3736,10 @@ (define-public %final-inputs ("libc:static" ,glibc-final "static") ("locales" ,glibc-utf8-locales-final)))) +(define-public %final-inputs-riscv64 + `(("gcc:lib" ,gcc-final "lib") + ,@%final-inputs)) + (define-public canonical-package (let ((name->package (fold (lambda (input result) (match input diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 651415098e..2f74000eef 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -273,7 +273,9 @@ (define (standard-packages) ;; Resolve (gnu packages commencement) lazily to hide circular dependency. (let ((distro (resolve-module '(gnu packages commencement)))) - (module-ref distro '%final-inputs))) + (if (target-riscv64?) + (module-ref distro '%final-inputs-riscv64) + (module-ref distro '%final-inputs)))) (define* (lower name #:key source inputs native-inputs outputs target base-commit: 1bfd634e335702d0b9b0189d685d14ec79f1cbf6 -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 27 02:55:50 2022 Received: (at 53503-done) by debbugs.gnu.org; 27 Jan 2022 07:55:50 +0000 Received: from localhost ([127.0.0.1]:54183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCzdG-0006Pb-DB for submit@debbugs.gnu.org; Thu, 27 Jan 2022 02:55:50 -0500 Received: from flashner.co.il ([178.62.234.194]:51028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCzdD-0006PK-AJ for 53503-done@debbugs.gnu.org; Thu, 27 Jan 2022 02:55:49 -0500 Received: from localhost (unknown [31.210.177.79]) by flashner.co.il (Postfix) with ESMTPSA id C3910401A0 for <53503-done@debbugs.gnu.org>; Thu, 27 Jan 2022 07:55:40 +0000 (UTC) Date: Thu, 27 Jan 2022 09:55:08 +0200 From: Efraim Flashner To: 53503-done@debbugs.gnu.org Subject: Re: bug#53503: Acknowledgement ([PATCH] gnu: Add %final-inputs-riscv64.) Message-ID: Mail-Followup-To: Efraim Flashner , 53503-done@debbugs.gnu.org References: <684a9e686ef9d8d326fefb4de794bd661fab564f.1643037303.git.efraim@flashner.co.il> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="8SGeLv0XJTrpPppo" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 53503-done 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: -1.0 (-) --8SGeLv0XJTrpPppo Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Patch pushed --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --8SGeLv0XJTrpPppo Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmHyT9gACgkQQarn3Mo9 g1Hdsw/+M9d9pmVTDa/t3TAGt3S+v+KX0UaL8anSzDsxFkRW3bf0g9byDw7EaPI3 44lwSGbjkuilJCMFtXPGDHKMhgaHE5yw7QmTrfXP/1dabQq+6qb+Ia/nzMisGFN4 /9obj+1ZQifCXtF6GierbZkMlyr/0x08IRU9r6wm9pq6PjWJ6wpeDQQ+8IS+HAa5 96aM798a5mzutoFlS8tx/ZS3pY8pGU1+bLwpGCiJ60MPJ/HxFTbNxi7jBwDsM8y4 l71/eFkFRvKi5bdi731dtRWKpd5IUYwt3iJ+mjtz8qMi+RQdPr7qVAZrMEa/kU/Z 11T0CxaknlanmVvabLfZakdgTz3VXfcLOj2vkULnX3Ge1jQj7xaWnU7MctoXegER BG6D8mZVl2Po1hB9HZNsUYYjZq3vCqY5dPKoLxY3vQ3ziHdE2ExUcWJPuF2XR3qH vc1Qt0ZagTvodfqc3h2cMjjWpPZGPwbhuu+4WOABvSov6GuGbnFV7C6mkcP+zMo/ TtWnmCxfvCb0oc2YipNc9l0UZSAbWf51Wy8ZrONQGIMBzOJwasHs9ZoiuMJ8Af3w 6eJkYWfoG7eUOBq1+dkmVaLCE7O6zDaqwUIEyitpE9kYlQ1enD+LKkkhPkLXw6aK RWcZ4ibcI5Gv7/Rlszpj48e+gbaHh1z46xf6WEey95XTcRLJt8Y= =0ACq -----END PGP SIGNATURE----- --8SGeLv0XJTrpPppo-- From unknown Fri Jun 20 07:13:13 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 24 Feb 2022 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator