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 v3 1/2] gnu: avr-gcc: Update to 7.5.0.
Date: Tue, 27 Oct 2020 20:30:18 +0100 [thread overview]
Message-ID: <20201027193019.15927-1-malte.f.gerdes@gmail.com> (raw)
In-Reply-To: <20200304200209.6309-1-arunisaac@systemreboot.net>
* 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.
---
gnu/packages/avr.scm | 32 ++++++--------------------------
1 file changed, 6 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index 76af6fdef1..573a5e089c 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -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 @@
(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 @@
(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 @@
(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 @@ C++.")
(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
--
2.29.1
next prev parent reply other threads:[~2020-10-27 19:31 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 ` [bug#39918] [PATCH v2 2/2] * gnu/packages/avr.scm (avr-gcc-7): Rename to avr-gcc Malte Frank Gerdes
2020-10-27 19:30 ` Malte Frank Gerdes [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201027193019.15927-1-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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.