GNU bug report logs - #39918
[PATCH 0/2] Update avr-gcc

Previous Next

Package: guix-patches;

Reported by: Arun Isaac <arunisaac <at> systemreboot.net>

Date: Wed, 4 Mar 2020 20:03:02 UTC

Severity: normal

Tags: patch

Done: Arun Isaac <arunisaac <at> systemreboot.net>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 39918 in the body.
You can then email your comments to 39918 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#39918; Package guix-patches. (Wed, 04 Mar 2020 20:03:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Arun Isaac <arunisaac <at> systemreboot.net>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 04 Mar 2020 20:03:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: guix-patches <at> gnu.org
Cc: dannym <at> scratchpost.org, Arun Isaac <arunisaac <at> systemreboot.net>,
 ekaitz <at> elenq.tech
Subject: [PATCH 0/2] Update avr-gcc
Date: Thu,  5 Mar 2020 01:32:09 +0530
Hi,

This patchset updates our avr-gcc to version 7, same as the version of gcc in
Guix. I have tentatively deleted other older versions of the avr-toolchain and
replaced our avr-libc and avr-toolchain functions with package variables. Do
we need to keep all older versions of the avr-toolchain? WDYT?

Regards,
Arun.

Arun Isaac (2):
  gnu: avr-gcc: Update to 7.4.0.
  gnu: avr-toolchain: Replace functions with package variables.

 gnu/packages/avr.scm | 67 +++++++++++++++-----------------------------
 1 file changed, 22 insertions(+), 45 deletions(-)

-- 
2.25.1





Information forwarded to guix-patches <at> gnu.org:
bug#39918; Package guix-patches. (Wed, 04 Mar 2020 20:10:02 GMT) Full text and rfc822 format available.

Message #8 received at 39918 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 39918 <at> debbugs.gnu.org
Cc: dannym <at> scratchpost.org, Arun Isaac <arunisaac <at> systemreboot.net>,
 ekaitz <at> elenq.tech
Subject: [PATCH 2/2] gnu: avr-toolchain: Replace functions with package
 variables.
Date: Thu,  5 Mar 2020 01:39:45 +0530
* gnu/packages/avr.scm (avr-gcc-7): Rename to avr-gcc.
(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 8a964b9b17..e6f8c36bd1 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -41,8 +41,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")
@@ -79,10 +79,10 @@
               (variable "CROSS_LIBRARY_PATH")
               (files '("avr/lib")))))
       (native-inputs
-       `(("gcc" ,gcc-7)
+       `(("gcc" ,gcc)
          ,@(package-native-inputs xgcc))))))
 
-(define (avr-libc avr-gcc)
+(define avr-libc
   (package
     (name "avr-libc")
     (version "2.0.0")
@@ -107,30 +107,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.25.1





Information forwarded to guix-patches <at> gnu.org:
bug#39918; Package guix-patches. (Wed, 04 Mar 2020 20:10:02 GMT) Full text and rfc822 format available.

Message #11 received at 39918 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 39918 <at> debbugs.gnu.org
Cc: dannym <at> scratchpost.org, Arun Isaac <arunisaac <at> systemreboot.net>,
 ekaitz <at> elenq.tech
Subject: [PATCH 1/2] gnu: avr-gcc: Update to 7.4.0.
Date: Thu,  5 Mar 2020 01:39:44 +0530
* 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 608e487b93..8a964b9b17 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2016 David Thompson <davet <at> gnu.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2020 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -40,8 +41,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")
@@ -78,18 +79,9 @@
               (variable "CROSS_LIBRARY_PATH")
               (files '("avr/lib")))))
       (native-inputs
-       `(("gcc" ,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")
@@ -104,18 +96,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/")
@@ -149,8 +130,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.25.1





Information forwarded to guix-patches <at> gnu.org:
bug#39918; Package guix-patches. (Tue, 27 Oct 2020 19:15:02 GMT) Full text and rfc822 format available.

Message #14 received at 39918 <at> debbugs.gnu.org (full text, mbox):

From: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
To: Arun Isaac <arunisaac <at> systemreboot.net>
Cc: 39918 <at> debbugs.gnu.org
Subject: Re: [bug#39918] [PATCH v2 0/2] gnu: avr-toolchain: Replace
 functions with package variables.
Date: Tue, 27 Oct 2020 20:14:48 +0100
Hi Arun,

i just wanted to try your patches, they don't apply anymore. I
recreated them on top of current master. It builds fine.


Malte




Information forwarded to guix-patches <at> gnu.org:
bug#39918; Package guix-patches. (Tue, 27 Oct 2020 19:16:02 GMT) Full text and rfc822 format available.

Message #17 received at 39918 <at> debbugs.gnu.org (full text, mbox):

From: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
To: 39918 <at> debbugs.gnu.org
Cc: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
Subject: [PATCH v2 1/2] * gnu/packages/avr.scm (avr-gcc-7,
 avr-toolchain-7): New variables.
Date: Tue, 27 Oct 2020 20:15:28 +0100
(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..3925297253 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2016 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2020 Arun Isaac <arunisaac <at> 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 <at> 5" ,gcc-5)
+       `(("gcc <at> 5" ,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





Information forwarded to guix-patches <at> gnu.org:
bug#39918; Package guix-patches. (Tue, 27 Oct 2020 19:16:02 GMT) Full text and rfc822 format available.

Message #20 received at 39918 <at> debbugs.gnu.org (full text, mbox):

From: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
To: 39918 <at> debbugs.gnu.org
Cc: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
Subject: [PATCH v2 2/2] * gnu/packages/avr.scm (avr-gcc-7): Rename to avr-gcc.
Date: Tue, 27 Oct 2020 20:15:29 +0100
(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 <at> 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





Information forwarded to guix-patches <at> gnu.org:
bug#39918; Package guix-patches. (Tue, 27 Oct 2020 19:31:02 GMT) Full text and rfc822 format available.

Message #23 received at 39918 <at> debbugs.gnu.org (full text, mbox):

From: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
To: 39918 <at> debbugs.gnu.org
Cc: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
Subject: [PATCH v3 1/2] gnu: avr-gcc: Update to 7.5.0.
Date: Tue, 27 Oct 2020 20:30:18 +0100
* 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 <at> flashner.co.il>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2020 Arun Isaac <arunisaac <at> 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 <at> 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





Information forwarded to guix-patches <at> gnu.org:
bug#39918; Package guix-patches. (Tue, 27 Oct 2020 19:31:02 GMT) Full text and rfc822 format available.

Message #26 received at 39918 <at> debbugs.gnu.org (full text, mbox):

From: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
To: 39918 <at> debbugs.gnu.org
Cc: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
Subject: [PATCH v3 2/2] gnu: avr-toolchain: Replace functions with package
 variables.
Date: Tue, 27 Oct 2020 20:30:19 +0100
* gnu/packages/avr.scm (avr-gcc-7): Rename to avr-gcc.
(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 573a5e089c..4ad4bb03ba 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" ,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





Information forwarded to guix-patches <at> gnu.org:
bug#39918; Package guix-patches. (Fri, 30 Oct 2020 07:04:01 GMT) Full text and rfc822 format available.

Message #29 received at 39918 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
Cc: 39918 <at> debbugs.gnu.org
Subject: Re: [bug#39918] [PATCH v2 0/2] gnu: avr-toolchain: Replace
 functions with package variables.
Date: Fri, 30 Oct 2020 12:33:40 +0530
[Message part 1 (text/plain, inline)]
Hi Malte,

Thank you for your feedback! This patchset has been stuck so long
because I didn't know if it was ok to collapse the package functions
into package variables, and whether we really needed all the old
versions. I'll try raising this on guix-devel.

Regards,
Arun
[signature.asc (application/pgp-signature, inline)]

Reply sent to Arun Isaac <arunisaac <at> systemreboot.net>:
You have taken responsibility. (Sun, 01 Nov 2020 19:20:02 GMT) Full text and rfc822 format available.

Notification sent to Arun Isaac <arunisaac <at> systemreboot.net>:
bug acknowledged by developer. (Sun, 01 Nov 2020 19:20:02 GMT) Full text and rfc822 format available.

Message #34 received at 39918-done <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: Malte Frank Gerdes <malte.f.gerdes <at> gmail.com>
Cc: 39918-done <at> debbugs.gnu.org
Subject: Re: [bug#39918] [PATCH v2 0/2] gnu: avr-toolchain: Replace
 functions with package variables.
Date: Mon, 02 Nov 2020 00:49:20 +0530
[Message part 1 (text/plain, inline)]
Hi Malte,

I've pushed this patchset to master after consulting with guix-devel.

Cheers!
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Mon, 30 Nov 2020 12:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 4 years and 254 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.