From patchwork Sun Sep 8 07:49:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67756 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 9762527BBEA; Sun, 8 Sep 2024 08:50:48 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham 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 4719927BBE2 for ; Sun, 8 Sep 2024 08:50:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snCgP-0001CV-KR; Sun, 08 Sep 2024 03:50: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 1snCgO-0001BK-5W for guix-patches@gnu.org; Sun, 08 Sep 2024 03:50:04 -0400 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 1snCgL-0003IL-JK for guix-patches@gnu.org; Sun, 08 Sep 2024 03:50:02 -0400 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:From:Date:To:Subject; bh=yO4Yr1kacipCk1GYk7qpLy/OjMI03SnMa/STgHAP2Jg=; b=l+IxTlEP26Gb3bD6XllllTPdBG/4gMRYttHDLN4llGpH09BHkk1rds7V3004QLiKZpOhQ8090KO95LaGzm7/OULZmG3tCQsumGX1d7c1OmF3iR0DowaKXp7z/qmfo/H3Un/wRtqex4F47akQTkjkC/vY1foyIL/k6rCN5y/3tkH4tVbfw816NwZzB2PEyUlBe3hrakvUJ4sntVKMtaO3xlSpCckNlm4rjk0EzPvLVqD7oCEKaGZaITs5pT3V3MeFVvCHpdunC8bWk2uS4/Bi43J9fOSyEBlqJX+LkWuE08sz1b0WyeMf4JMgj2Ik+5FxPKG+ueoryt+0U/KDS5HDyA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snCgN-0003yt-DC for guix-patches@gnu.org; Sun, 08 Sep 2024 03:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73118] [PATCH 4/5] Fix arm-none-eabi 7 newlib nano variant Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 07:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73118@debbugs.gnu.org Cc: Rutherther Received: via spool by 73118-submit@debbugs.gnu.org id=B73118.172578176915192 (code B ref 73118); Sun, 08 Sep 2024 07:50:03 +0000 Received: (at 73118) by debbugs.gnu.org; 8 Sep 2024 07:49:29 +0000 Received: from localhost ([127.0.0.1]:57942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snCfo-0003wy-VU for submit@debbugs.gnu.org; Sun, 08 Sep 2024 03:49:29 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:46297) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snCfm-0003wk-S1 for 73118@debbugs.gnu.org; Sun, 08 Sep 2024 03:49:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725781757; x=1726040957; bh=yO4Yr1kacipCk1GYk7qpLy/OjMI03SnMa/STgHAP2Jg=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=D1KpV9m4b5sTyFhY+0rwvtNlR5gpr8AuisZgNnrIBYaLAodv54e/lrQtD98WMog/Y m2aINi/HoQjGW4UnJR8ohf90SRsiicdEDj2Afkh6hyVlsIMFzW6GfuQid6XpdMFRpT RnREnyg7dtpQ2SuPn9cCKqDgYNmz3lu6hDsVMaU1ZldjTfg+IKk60ECCMahteZu3nL QoAjco+JeM192Lbm4w7GLG6XD6S0T/3j1xi74jGc6V0/jPWpNdsPWziMz24OZZaKzh jmECkqCpNoSR0cjgr2KqmkUCrnUp75uivJffkAu31vu5+GGkP7cBmb3h1omEryZPAg jhDuuKrK0lnVg== Date: Sun, 08 Sep 2024 07:49:13 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: f9f913800369b7ec7b5a342db394ad8bf99477f7 MIME-Version: 1.0 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: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther 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 The nano variant was not nano. It was just a copy of the original one with different name. This meant there were no _nano.a files present at all. --- gnu/packages/embedded.scm | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 1ea794724c..4093c10916 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -247,10 +247,7 @@ (define make-newlib-arm-none-eabi (modify-phases %standard-phases (add-after 'unpack 'fix-references-to-/bin/sh (lambda _ - (substitute* '("libgloss/arm/cpu-init/Makefile.in" - "libgloss/arm/Makefile.in" - "libgloss/libnosys/Makefile.in" - "libgloss/Makefile.in") + (substitute* (find-files "libgloss" "^Makefile\\.in$") (("/bin/sh") (which "sh"))) #t))))) (native-inputs @@ -430,12 +427,11 @@ (define make-gcc-arm-none-eabi-7-2018-q2-update (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib"))))))))) -(define make-newlib-arm-none-eabi-7-2018-q2-update +(define make-base-newlib-arm-none-eabi-7-2018-q2-update ;; This is the same commit as used for the 7-2018-q2-update release ;; according to the release.txt. - (mlambda () - (let ((base (make-newlib-arm-none-eabi)) - (commit "3ccfb407af410ba7e54ea0da11ae1e40b554a6f4") + (mlambda (base) + (let ((commit "3ccfb407af410ba7e54ea0da11ae1e40b554a6f4") (revision "0")) (package (inherit base) @@ -464,15 +460,13 @@ (define make-newlib-arm-none-eabi-7-2018-q2-update ("xgcc" ,(make-gcc-arm-none-eabi-7-2018-q2-update)) ("texinfo" ,texinfo))))))) -(define-public make-newlib-nano-arm-none-eabi-7-2018-q2-update +(define make-newlib-arm-none-eabi-7-2018-q2-update (mlambda () - (let ((base (make-newlib-arm-none-eabi-7-2018-q2-update))) - (package - (inherit base) - (name "newlib-nano") - (arguments - (package-arguments base)) - (synopsis "Newlib variant for small systems with limited memory"))))) + (make-base-newlib-arm-none-eabi-7-2018-q2-update (make-newlib-arm-none-eabi)))) + +(define make-newlib-nano-arm-none-eabi-7-2018-q2-update + (mlambda () + (make-base-newlib-arm-none-eabi-7-2018-q2-update (make-newlib-nano-arm-none-eabi)))) (define make-libstdc++-arm-none-eabi