amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: avr-toolchain: Replace functions with package variables.

Browse source 
* gnu/packages/avr.scm (avr-gcc-7): Rename to avr-gcc.
(avr-libc): Replace function with variable.
(avr-toolchain): Replace function with variable.
This commit is contained in:
Arun Isaac 2020-03-05 01:16:11 +05:30
parent 5a3827d433
commit 197c1676d3
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
1 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/avr.scm
View file

@ -42,8 +42,8 @@
(inherit (cross-binutils "avr")) (inherit (cross-binutils "avr"))
(name "avr-binutils"))) (name "avr-binutils")))
(define-public avr-gcc-7 (define avr-gcc
(let ((xgcc (cross-gcc "avr" #:xgcc gcc-7 #:xbinutils avr-binutils))) (let ((xgcc (cross-gcc "avr" #:xgcc gcc #:xbinutils avr-binutils)))
(package (package
(inherit xgcc) (inherit xgcc)
(name "avr-gcc") (name "avr-gcc")
@ -95,10 +95,10 @@
(variable "CROSS_LIBRARY_PATH") (variable "CROSS_LIBRARY_PATH")
(files '("avr/lib"))))) (files '("avr/lib")))))
(native-inputs (native-inputs
`(("gcc" ,gcc-7) `(("gcc" ,gcc)
,@(package-native-inputs xgcc)))))) ,@(package-native-inputs xgcc))))))
(define (avr-libc avr-gcc) (define avr-libc
(package (package
(name "avr-libc") (name "avr-libc")
(version "2.0.0") (version "2.0.0")
@ -123,10 +123,9 @@ for use with GCC on Atmel AVR microcontrollers.")
(license (license
(license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt")))) (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. ;; 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. ;; 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 (package
(name "avr-toolchain") (name "avr-toolchain")
(version (package-version avr-gcc)) (version (package-version avr-gcc))
@ -144,9 +143,7 @@ microcontroller development. This includes the GCC AVR cross compiler and
avrdude for firmware flashing. The supported programming languages are C and avrdude for firmware flashing. The supported programming languages are C and
C++.") C++.")
(home-page (package-home-page avr-libc)) (home-page (package-home-page avr-libc))
(license (package-license avr-gcc))))) (license (package-license avr-gcc))))
(define-public avr-toolchain-7 (avr-toolchain avr-gcc-7))
(define-public microscheme (define-public microscheme
(package (package