From patchwork Tue Oct 27 19:15:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malte Frank Gerdes X-Patchwork-Id: 24832 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 AB0D927BBF3; Tue, 27 Oct 2020 19:28:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0AEF227BBF2 for ; Tue, 27 Oct 2020 19:28:01 +0000 (GMT) Received: from localhost ([::1]:52050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXUdU-000318-65 for patchwork@mira.cbaines.net; Tue, 27 Oct 2020 15:28:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXURv-0005Bj-11 for guix-patches@gnu.org; Tue, 27 Oct 2020 15:16:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34344) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXURu-0002pS-NJ for guix-patches@gnu.org; Tue, 27 Oct 2020 15:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kXURu-0002zQ-K3 for guix-patches@gnu.org; Tue, 27 Oct 2020 15:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39918] [PATCH v2 2/2] * gnu/packages/avr.scm (avr-gcc-7): Rename to avr-gcc. Resent-From: Malte Frank Gerdes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Oct 2020 19:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39918 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39918@debbugs.gnu.org Cc: Malte Frank Gerdes Received: via spool by 39918-submit@debbugs.gnu.org id=B39918.160382615411462 (code B ref 39918); Tue, 27 Oct 2020 19:16:02 +0000 Received: (at 39918) by debbugs.gnu.org; 27 Oct 2020 19:15:54 +0000 Received: from localhost ([127.0.0.1]:45889 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXURl-0002yj-S2 for submit@debbugs.gnu.org; Tue, 27 Oct 2020 15:15:54 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:43025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXURd-0002yH-Ti for 39918@debbugs.gnu.org; Tue, 27 Oct 2020 15:15:46 -0400 Received: by mail-ej1-f66.google.com with SMTP id k3so3797410ejj.10 for <39918@debbugs.gnu.org>; Tue, 27 Oct 2020 12:15:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bj2JDLna/46T7EsZ3msyXKbFfDIxPYJccAHrAVdoJuI=; b=rYjRB4B3/geTLR5RKfkBZtbeM+B2XcYG8YUCJVCCGU/RFc9FoD13qIYKkoBYkxgokk 2XnDk9XXrubJZTA3z7pGEEd8YvYOILJ2rdrtixgEGcxEm8o/vmbY8gPjJBdnPNr+RiBz RKyJ72bPboDm/QFjZnr34dWdlBpXrQitwl0jZtvyGy2cl8craqyZWqxnpk/k3UaokeCL V/RRzU/4/vvVdEKTD/Pc5CsO1oFWvzbBxMxxxKra80dozb8tH29V7LGqybq5a/3h2z5J yueqin3z0gS8UpydjvGB+fdCSi0fZQ7n8LjNE+ShJuS3nv8+m00CVq2+OvbOheDgf1dQ CRQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bj2JDLna/46T7EsZ3msyXKbFfDIxPYJccAHrAVdoJuI=; b=k7PISfc0Q1PcbAifjkD4tMYh2pOLxpFv6EUBvH2kXaHWtHemlrlje4QBxd2wLv+vKi WAr7YlIeZWRG3QoPjJdq01/5toa3X9TxrjQUN0gKwS3D/PV2LWBtrfe7TNQ1CAutIrap FJsHHVUzphThUMkNv6UlXL5MHeRUjGIlgwVkdr3DJXoPUYAgkNIZK63YzD9UltUX8XQH zOYU0a0nK0kkzMourtCrdIg6BI1i5I3mXyQLzbcUW0khEay4dr0WsXQsu5sMBO5cTQaC GtmPeVYVs7QqFzQ6uN5fHG+1IgiesFSJ2yLvnAZGERbWoLKPxsihnPmxC6xxvrYGB1VD ovdQ== X-Gm-Message-State: AOAM530MHw/cK0dYA7rcLKsuadk/o05h9+ZWpzWa53iKtThbBJh6MrlY erPtU1k9qdGZE7+LxT5qizs9qna6Q8M= X-Google-Smtp-Source: ABdhPJyYAYm+8ciWmDxNOaRQ1vqXIwZB3wPfqEjNVwZqXJdK5d4vQzrZcVZtlrIihtGqGJPRmKGgxw== X-Received: by 2002:a17:906:2dc7:: with SMTP id h7mr4085707eji.546.1603826139917; Tue, 27 Oct 2020 12:15:39 -0700 (PDT) Received: from Morphium.intus (ip-84-118-73-55.unity-media.net. [84.118.73.55]) by smtp.gmail.com with ESMTPSA id h8sm1519932edw.68.2020.10.27.12.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 12:15:39 -0700 (PDT) From: Malte Frank Gerdes Date: Tue, 27 Oct 2020 20:15:29 +0100 Message-Id: <20201027191529.12537-2-malte.f.gerdes@gmail.com> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027191529.12537-1-malte.f.gerdes@gmail.com> References: <20201027191529.12537-1-malte.f.gerdes@gmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches (avr-libc): Replace function with variable. (avr-toolchain): Replace function with variable. --- gnu/packages/avr.scm | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 3925297253..c113707283 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -42,8 +42,8 @@ (inherit (cross-binutils "avr")) (name "avr-binutils"))) -(define-public avr-gcc-7 - (let ((xgcc (cross-gcc "avr" #:xgcc gcc-7 #:xbinutils avr-binutils))) +(define avr-gcc + (let ((xgcc (cross-gcc "avr" #:xgcc gcc #:xbinutils avr-binutils))) (package (inherit xgcc) (name "avr-gcc") @@ -95,10 +95,10 @@ (variable "CROSS_LIBRARY_PATH") (files '("avr/lib"))))) (native-inputs - `(("gcc@5" ,gcc-7) + `(("gcc" ,gcc) ,@(package-native-inputs xgcc)))))) -(define (avr-libc avr-gcc) +(define avr-libc (package (name "avr-libc") (version "2.0.0") @@ -123,30 +123,27 @@ for use with GCC on Atmel AVR microcontrollers.") (license (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt")))) -(define (avr-toolchain avr-gcc) +(define-public avr-toolchain ;; avr-libc checks the compiler version and passes "--enable-device-lib" for avr-gcc > 5.1.0. ;; It wouldn't install the library for atmega32u4 etc if we didn't use the corret avr-gcc. - (let ((avr-libc (avr-libc avr-gcc))) - (package - (name "avr-toolchain") - (version (package-version avr-gcc)) - (source #f) - (build-system trivial-build-system) - (arguments '(#:builder (begin (mkdir %output) #t))) - (propagated-inputs - `(("avrdude" ,avrdude) - ("binutils" ,avr-binutils) - ("gcc" ,avr-gcc) - ("libc" ,avr-libc))) - (synopsis "Complete GCC tool chain for AVR microcontroller development") - (description "This package provides a complete GCC tool chain for AVR + (package + (name "avr-toolchain") + (version (package-version avr-gcc)) + (source #f) + (build-system trivial-build-system) + (arguments '(#:builder (begin (mkdir %output) #t))) + (propagated-inputs + `(("avrdude" ,avrdude) + ("binutils" ,avr-binutils) + ("gcc" ,avr-gcc) + ("libc" ,avr-libc))) + (synopsis "Complete GCC tool chain for AVR microcontroller development") + (description "This package provides a complete GCC tool chain for AVR microcontroller development. This includes the GCC AVR cross compiler and avrdude for firmware flashing. The supported programming languages are C and C++.") - (home-page (package-home-page avr-libc)) - (license (package-license avr-gcc))))) - -(define-public avr-toolchain-7 (avr-toolchain avr-gcc-7)) + (home-page (package-home-page avr-libc)) + (license (package-license avr-gcc)))) (define-public microscheme (package