From: Malte Frank Gerdes <malte.f.gerdes@gmail.com>
To: 39918@debbugs.gnu.org
Cc: Malte Frank Gerdes <malte.f.gerdes@gmail.com>
Subject: [bug#39918] [PATCH v2 2/2] * gnu/packages/avr.scm (avr-gcc-7): Rename to avr-gcc.
Date: Tue, 27 Oct 2020 20:15:29 +0100 [thread overview]
Message-ID: <20201027191529.12537-2-malte.f.gerdes@gmail.com> (raw)
In-Reply-To: <20201027191529.12537-1-malte.f.gerdes@gmail.com>
(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
--
2.29.1
next prev parent reply other threads:[~2020-10-27 19:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-04 20:02 [bug#39918] [PATCH 0/2] Update avr-gcc Arun Isaac
2020-03-04 20:09 ` [bug#39918] [PATCH 1/2] gnu: avr-gcc: Update to 7.4.0 Arun Isaac
2020-03-04 20:09 ` [bug#39918] [PATCH 2/2] gnu: avr-toolchain: Replace functions with package variables Arun Isaac
2020-10-27 19:14 ` [bug#39918] [PATCH v2 0/2] " Malte Frank Gerdes
2020-10-30 7:03 ` Arun Isaac
2020-11-01 19:19 ` bug#39918: " Arun Isaac
2020-10-27 19:15 ` [bug#39918] [PATCH v2 1/2] * gnu/packages/avr.scm (avr-gcc-7, avr-toolchain-7): New variables Malte Frank Gerdes
2020-10-27 19:15 ` Malte Frank Gerdes [this message]
2020-10-27 19:30 ` [bug#39918] [PATCH v3 1/2] gnu: avr-gcc: Update to 7.5.0 Malte Frank Gerdes
2020-10-27 19:30 ` [bug#39918] [PATCH v3 2/2] gnu: avr-toolchain: Replace functions with package variables Malte Frank Gerdes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201027191529.12537-2-malte.f.gerdes@gmail.com \
--to=malte.f.gerdes@gmail.com \
--cc=39918@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).