ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: avr-gcc: Update to 7.5.0.

Browse source 
* gnu/packages/avr.scm (avr-gcc-7, avr-toolchain-7): New variables.
(avr-gcc-4.9, avr-gcc-5, avr-toolchain-4.9, avr-toolchain-5): Delete
variables.
(avr-libc)[arguments]: Remove custom fix-cpath phase.
This commit is contained in:
Arun Isaac 2020-03-05 01:06:38 +05:30
parent 2d05f1fc39
commit 5a3827d433
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
1 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gnu/packages/avr.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -41,8 +42,8 @@ (define-public avr-binutils
(inherit (cross-binutils "avr"))
(name "avr-binutils")))
(define-public avr-gcc-4.9
(let ((xgcc (cross-gcc "avr" #:xgcc gcc-4.9 #:xbinutils avr-binutils)))
(define-public avr-gcc-7
(let ((xgcc (cross-gcc "avr" #:xgcc gcc-7 #:xbinutils avr-binutils)))
(package
(inherit xgcc)
(name "avr-gcc")
@ -94,18 +95,9 @@ (define-public avr-gcc-4.9
(variable "CROSS_LIBRARY_PATH")
(files '("avr/lib")))))
(native-inputs
`(("gcc@5" ,gcc-5)
`(("gcc" ,gcc-7)
,@(package-native-inputs xgcc))))))
(define-public avr-gcc-5
(package
(inherit avr-gcc-4.9)
(version (package-version gcc-5))
(source (origin
(inherit (package-source gcc-5))
(patches (append (origin-patches (package-source gcc-5))
(search-patches "gcc-cross-environment-variables.patch")))))))
(define (avr-libc avr-gcc)
(package
(name "avr-libc")
@ -120,18 +112,7 @@ (define (avr-libc avr-gcc)
(build-system gnu-build-system)
(arguments
'(#:out-of-source? #t
#:configure-flags '("--host=avr")
#:phases
(modify-phases %standard-phases
(add-before 'unpack 'fix-cpath
(lambda _
;; C_INCLUDE_PATH and CPATH pose issues for cross-building,
;; leading to failures when building avr-libc on 64-bit systems.
;; Simply unsetting them allows the build to succeed because it
;; doesn't try to use any of the native system's headers.
(unsetenv "C_INCLUDE_PATH")
(unsetenv "CPATH")
#t)))))
#:configure-flags '("--host=avr")))
(native-inputs `(("avr-binutils" ,avr-binutils)
("avr-gcc" ,avr-gcc)))
(home-page "https://www.nongnu.org/avr-libc/")
@ -165,8 +146,7 @@ (define (avr-toolchain avr-gcc)
(home-page (package-home-page avr-libc))
(license (package-license avr-gcc)))))
(define-public avr-toolchain-4.9 (avr-toolchain avr-gcc-4.9))
(define-public avr-toolchain-5 (avr-toolchain avr-gcc-5))
(define-public avr-toolchain-7 (avr-toolchain avr-gcc-7))
(define-public microscheme
(package