From patchwork Mon Nov 27 14:24:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kristian Lein-Mathisen X-Patchwork-Id: 56856 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 9006527BBEA; Mon, 27 Nov 2023 14:26:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, 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 44B8227BBE2 for ; Mon, 27 Nov 2023 14:26:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7cYg-0004Sz-I8; Mon, 27 Nov 2023 09:25:58 -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 1r7cYe-0004Sc-QJ for guix-patches@gnu.org; Mon, 27 Nov 2023 09:25:57 -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 1r7cYd-0007II-Pb for guix-patches@gnu.org; Mon, 27 Nov 2023 09:25:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7cYj-00012J-Q4 for guix-patches@gnu.org; Mon, 27 Nov 2023 09:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67484] gnu: avr-libc: Update to 2.1-1 (git version) Resent-From: Kristian Lein-Mathisen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Nov 2023 14:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67484 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 67484@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17010951253940 (code B ref -1); Mon, 27 Nov 2023 14:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Nov 2023 14:25:25 +0000 Received: from localhost ([127.0.0.1]:43583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7cY8-00011T-Az for submit@debbugs.gnu.org; Mon, 27 Nov 2023 09:25:25 -0500 Received: from lists.gnu.org ([2001:470:142::17]:55022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7cY6-00011C-83 for submit@debbugs.gnu.org; Mon, 27 Nov 2023 09:25:22 -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 1r7cXl-0004NL-C1 for guix-patches@gnu.org; Mon, 27 Nov 2023 09:25:01 -0500 Received: from mail-oo1-xc2d.google.com ([2607:f8b0:4864:20::c2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r7cXi-0006x0-5v for guix-patches@gnu.org; Mon, 27 Nov 2023 09:24:59 -0500 Received: by mail-oo1-xc2d.google.com with SMTP id 006d021491bc7-5841a3ffd50so269114eaf.1 for ; Mon, 27 Nov 2023 06:24:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701095096; x=1701699896; darn=gnu.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=MLVQMQHYjB4Vn5G9Y9veb0ud3Hag8iB765xATNjtpYw=; b=eUtu76OJT9nMWdtgMbeNS/ok8GAuXrczQq0AGJbyD/xbKUJrJe1oTP9bsw5tfV8Lrj qrjLxh0pcR0jw3jiW2t0+OjJd8POv+ySMskfwgz9SZc4CtYoO3ZZNynfz86EifNwqOqg gAet7pD/j/CnNvBGdlXljowgAmClB8BYzidVn9ETKDdJZFbUcWcKszRc2fbLvzIo3Nzt SO3KR4tcC4CchtMGhH78QqOTV4r9nwLkaI8tCqwhTnbj/oCFX96yY3FGrjO4sXSTF/N9 Pd3rktKHmSRplWH3mbUaA/4Rzx6+HwqVm7l16O6VL9WlqndqvbBdHL2I48F4mqk2jS+6 ATxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701095096; x=1701699896; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MLVQMQHYjB4Vn5G9Y9veb0ud3Hag8iB765xATNjtpYw=; b=XbH0ziAAv618hcyqf1F+0aKMHnXAeZp3EbfiFTuTvElUy9Ko+VUu+LDVuTRCHaXd/Z wZzrvP3NuRv2VFLjwkd0P06zL4tRndgVSk35EyTngWPvkPBkO2ggLI3xomUPahqN3uON QLB6rkLx9VDbBL0RqQ5luofsUnrh2A2fmBT9PGVtOnlLp6F+3WOuQ/vB4Zz0z8obKTl1 433TZjbnIUBULXxOsin/SmmcpPfwCN/hKmvutH0g5GyEOta4LMDQ0/vp9BmXmaTkV3iv NMl98ldlykuGb+GJfUtIstQckYBaz6qDjeMI5W0jLwnRsGEdbjy6hJah6xJxyk4ovssM PYuA== X-Gm-Message-State: AOJu0YyhikNFkXpTU9fn2FfP55V2T8ImbizDJkxSQgJw5i+SCm9mVKkW 5I/It0ISN6UYMqVRSLx5aptad10ZGn8wh9m20yGum+Mu/Y265Q== X-Google-Smtp-Source: AGHT+IGnAMFQu1KnbWdCquz9AyKUsIsSbo5AhN5N0DbdeAwLSILOKTpHum2J+0JVFVJlKYyNuSkBhDBaoWivevpsEcI= X-Received: by 2002:a05:6820:e83:b0:58c:ec4c:fcac with SMTP id em3-20020a0568200e8300b0058cec4cfcacmr10264300oob.0.1701095096518; Mon, 27 Nov 2023 06:24:56 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Kristian Lein-Mathisen Date: Mon, 27 Nov 2023 15:24:57 +0100 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::c2d; envelope-from=kristianlein@gmail.com; helo=mail-oo1-xc2d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , 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 And here, the attachment. How embarrassing! K. On Mon, Nov 27, 2023 at 2:03 PM Kristian Lein-Mathisen < kristianlein@gmail.com> wrote: > > Hi, > > I'm working with the newest AVR devices and as such need the newer > avr-libc. avr-libc was moved from savannah to github and seems to have no > official releases after 2.1. However, several new AVR devices have been > added to the post 2.1-release and this is useful to package. avr-libc > currently most recent commit > > is quite old, from Jul 6, 2022, and it the once I've used here. > > My patch simply replaces the older 2.0 avr-libc which may rise some > stability concerns. If there is a way to parameterize make-avr-libc to > support both 2.0 and 2.1-1 (and perhaps 2.1) in a way that's accessibly to > (make-avr-toolchain #:xgcc gcc-14), please advice. > > Also, there used to be an old avr-toolchain package which is now gone. I > now have to issue > > > guix package -e '(begin (import (gnu packages avr) (gnu packages gcc)) > (make-avr-toolchain #:xgcc gcc-13))' > > In order to install avr-gcc, is this how this is intended to work? > > Thanks for any pointers, > K. > From 902d1628ec6902f726152cd52815521fd5091153 Mon Sep 17 00:00:00 2001 From: Kristian Lein-Mathisen Date: Mon, 27 Nov 2023 13:08:55 +0100 Subject: [PATCH] gnu: avr-libc: Update to unofficial 2.1-1 * gnu/packages/avr.scm (gnu): Update to 2.1-1 --- gnu/packages/avr.scm | 60 ++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index a66abbbd3a..420b17b469 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -38,6 +38,8 @@ (define-module (gnu packages avr) #:use-module (gnu packages cross-base) #:use-module (gnu packages flashing-tools) #:use-module (gnu packages gcc) + #:use-module (gnu packages python) + #:use-module (gnu packages autotools) #:use-module (gnu packages llvm) #:use-module (gnu packages vim) #:export (make-avr-toolchain)) @@ -120,29 +122,43 @@ (define make-avr-gcc (memoize make-avr-gcc/implementation)) (define* (make-avr-libc/implementation #:key (xgcc gcc)) - (package - (name "avr-libc") - (version "2.0.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah//avr-libc/avr-libc-" - version ".tar.bz2")) - (sha256 - (base32 - "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj")))) - (build-system gnu-build-system) - (arguments - '(#:out-of-source? #t - #:configure-flags '("--host=avr"))) - (native-inputs `(("avr-binutils" ,(make-avr-binutils)) - ("avr-gcc" ,(make-avr-gcc #:xgcc xgcc)))) - (home-page "https://www.nongnu.org/avr-libc/") - (synopsis "The AVR C Library") - (description - "AVR Libc is a project whose goal is to provide a high quality C library + (let ((commit "55e8cac69935657bcd3e4d938750960c757844c3") + (revision "1")) ;; post-2.1 they say + (package + (name "avr-libc") + (version (git-version "2.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/avrdudes/avr-libc") + (commit commit))) + (sha256 + (base32 "00zgrd8sy7449hycr6429flv2ivddndbjvz0bi62sjalqyy7f3w7")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + '(#:out-of-source? #t + #:configure-flags '("--host=avr") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-shebangs + (lambda _ + (substitute* "devtools/gen-avr-lib-tree.sh" + (("#! /bin/sh") (string-append "#!" (which "sh")))) + (substitute* "devtools/mlib-gen.py" + (("#!/usr/bin/env python") (string-append "#!" (which "python3"))))))))) + (native-inputs `(("avr-binutils" ,(make-avr-binutils)) + ("avr-gcc" ,(make-avr-gcc #:xgcc gcc)) + ("python" ,python) + ("automake" ,automake) + ("autoconf" ,autoconf))) + (home-page "https://www.nongnu.org/avr-libc/") + (synopsis "The AVR C Library") + (description + "AVR Libc is a project whose goal is to provide a high quality C library for use with GCC on Atmel AVR microcontrollers.") - (license - (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt")))) + (license + (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))) (define make-avr-libc (memoize make-avr-libc/implementation)) base-commit: 3778f778c37110460dd78088200cbd05eb0c49e4 -- 2.41.0