From patchwork Fri Sep 13 11:42:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67927 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 5938827BBEA; Fri, 13 Sep 2024 12:43:51 +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,URIBL_BLOCKED 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 0039527BBE2 for ; Fri, 13 Sep 2024 12:43:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sp4hY-0003l3-HL; Fri, 13 Sep 2024 07:43:00 -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 1sp4hT-0003jT-Ib for guix-patches@gnu.org; Fri, 13 Sep 2024 07:42:55 -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 1sp4hT-0005Oy-0k for guix-patches@gnu.org; Fri, 13 Sep 2024 07:42:55 -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=KpKZ0skQugrRbPEV570E1FIljw3H/AHNGpR/HHlv+Ig=; b=BfkaAENklbZVV681vFqi7O6MGtFLci4i0WP6d2Yggh9D1iZSmnx1nkzso+tMy4fAFjOgVy0Mb9VuNLou+zh5jxLlnyoSnKw1TXD2wwVUZ0FD2qnNRcKz3rHXeBpwqpry0bH7wP2ffE4Hz5l2jc5LIZvA0l7l4cgkP4xbBpiO8Qrj9NYY0UHEl6yTeJ1+JrVFRvLa+MftDkLTzqQfwnm968Mpqi3I+JDYzJFM1HqgwgNQud49RpIOuEviGkDMGbONAGXFXBy1ziFlkxsMiGdm74WuII8Q7oWI3aAgmjwaSTwTXnOkjBIukTBRp8MP8swiI6NXwJJNPmkX+xHpFefxFg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sp4hc-0008I5-1A for guix-patches@gnu.org; Fri, 13 Sep 2024 07:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73118] [PATCH v2 4/5] gnu: newlib arm-none-eabi-7-2018-q2-update: Add proper newlib-nano variant. Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Sep 2024 11:43:04 +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.172622776231783 (code B ref 73118); Fri, 13 Sep 2024 11:43:04 +0000 Received: (at 73118) by debbugs.gnu.org; 13 Sep 2024 11:42:42 +0000 Received: from localhost ([127.0.0.1]:42620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp4hG-0008GZ-0y for submit@debbugs.gnu.org; Fri, 13 Sep 2024 07:42:42 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:43575) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp4hD-0008GE-Mc for 73118@debbugs.gnu.org; Fri, 13 Sep 2024 07:42:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1726227744; x=1726486944; bh=KpKZ0skQugrRbPEV570E1FIljw3H/AHNGpR/HHlv+Ig=; 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=o/rcFGTmlV9rqvZMMVNOaGJrcLk9nO3MYZRjDB7B+4p7j2PaiUwkJv6d4V0Yoq9vB 7Kbmx5cuMCvPoMEVGE1yhRkXAAmyi+UczqQpGcKhEAawTOyhFhS/+v0PWxdtIZC70v 18F70F0CwXYLI6F7apjVGzfOBOYVGVypYU8c01vXKcIMX+6381hmACionqtNHoVm1s m5ag72JqVav5X3WeKwx3XKANwTgXvfm/PKVjjcj3SEcYJdYJa6k5vjFRdrt/ZILaDC X3pPFwOCpHzbYeeIxI6jHy3MG3wGGnbIB5bBw4PJfcJErnBzKVPLMGZPK6oicUceSM wy8dkXYCuGHOQ== Date: Fri, 13 Sep 2024 11:42:19 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 010e5a775c7143f7969a38871d0352cd84632895 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 for 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, and the flags were the same, not producing a smaller library. * gnu/packages/embedded.scm (make-base-newlib-arm-none-eabi-7-2018-q2-update): Rename variable from make-newlib-arm-none-eabi-7-2018-q2-update. * gnu/packages/embedded.scm (make-newlib-nano-arm-none-eabi-7-2018-q2-update): Add variable. * gnu/packages/embedded.scm (make-newlib-arm-none-eabi-7-2018-q2-update): Inherit from make-base-newlib-arm-none-eabi-7-2018-q2-update. Change-Id: I01517ed860dfb2b6a9c7e912fd724832f5a0500a --- 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 847eb8059c..4b9da1f529 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