From patchwork Wed Mar 4 20:09:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 20535 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A76FB27BBEA; Wed, 4 Mar 2020 20:10:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5CED227BBE4 for ; Wed, 4 Mar 2020 20:10:12 +0000 (GMT) Received: from localhost ([::1]:39210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9aLL-000424-Sc for patchwork@mira.cbaines.net; Wed, 04 Mar 2020 15:10:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52812) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9aLE-00041c-J7 for guix-patches@gnu.org; Wed, 04 Mar 2020 15:10:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9aLD-0000Ay-Av for guix-patches@gnu.org; Wed, 04 Mar 2020 15:10:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9aLC-0000AY-Rf for guix-patches@gnu.org; Wed, 04 Mar 2020 15:10:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j9aLC-0006ub-NP for guix-patches@gnu.org; Wed, 04 Mar 2020 15:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39918] [PATCH 1/2] gnu: avr-gcc: Update to 7.4.0. References: <20200304200209.6309-1-arunisaac@systemreboot.net> In-Reply-To: <20200304200209.6309-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Mar 2020 20:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39918 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39918@debbugs.gnu.org Cc: dannym@scratchpost.org, Arun Isaac , ekaitz@elenq.tech Received: via spool by 39918-submit@debbugs.gnu.org id=B39918.158335259626545 (code B ref 39918); Wed, 04 Mar 2020 20:10:02 +0000 Received: (at 39918) by debbugs.gnu.org; 4 Mar 2020 20:09:56 +0000 Received: from localhost ([127.0.0.1]:41901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9aL5-0006tz-Ky for submit@debbugs.gnu.org; Wed, 04 Mar 2020 15:09:55 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:38856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9aL1-0006ti-WF for 39918@debbugs.gnu.org; Wed, 04 Mar 2020 15:09:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=w1kXrDwjuX0OBPViy4PU7FZAZkd764Azq+VnBgE6NXU=; b=cLqLEhQq6SwF0UcfQ+v2eo0+1Y 9j+Ezoh7GwGxOHSxCdhvpvYuTu2/tzuCTberNX3S/lAgzApMfSvb9bz0EPvfxkgYi6cMM5w6A8v+Y uH18/qbfD8VENivV1OeVN4/pqgMPjhgFUhCn/ICV/xcwTNN7VRM9x8bWoXJMBaAY7CuY=; Received: from [192.168.2.1] (helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1j9aKy-002L7h-0F; Thu, 05 Mar 2020 01:39:48 +0530 From: Arun Isaac Date: Thu, 5 Mar 2020 01:39:44 +0530 Message-Id: <20200304200945.6657-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2020 Arun Isaac ;;; ;;; 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 From patchwork Wed Mar 4 20:09:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 20536 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C59B627BBEA; Wed, 4 Mar 2020 20:10:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7A0E927BBE4 for ; Wed, 4 Mar 2020 20:10:13 +0000 (GMT) Received: from localhost ([::1]:39212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9aLL-000429-Ur for patchwork@mira.cbaines.net; Wed, 04 Mar 2020 15:10:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52808) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9aLE-00041b-GB for guix-patches@gnu.org; Wed, 04 Mar 2020 15:10:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9aLD-0000B3-B9 for guix-patches@gnu.org; Wed, 04 Mar 2020 15:10:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35928) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9aLC-00009D-Ee for guix-patches@gnu.org; Wed, 04 Mar 2020 15:10:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j9aLC-0006uT-9N for guix-patches@gnu.org; Wed, 04 Mar 2020 15:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39918] [PATCH 2/2] gnu: avr-toolchain: Replace functions with package variables. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Mar 2020 20:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39918 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39918@debbugs.gnu.org Cc: dannym@scratchpost.org, Arun Isaac , ekaitz@elenq.tech Received: via spool by 39918-submit@debbugs.gnu.org id=B39918.158335259526538 (code B ref 39918); Wed, 04 Mar 2020 20:10:02 +0000 Received: (at 39918) by debbugs.gnu.org; 4 Mar 2020 20:09:55 +0000 Received: from localhost ([127.0.0.1]:41899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9aL5-0006tx-CV for submit@debbugs.gnu.org; Wed, 04 Mar 2020 15:09:55 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:38854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j9aL1-0006th-W1 for 39918@debbugs.gnu.org; Wed, 04 Mar 2020 15:09:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=qbefj5JK2hzST8MufcwHgHd65UClQ9q6G78PYxIfV+A=; b=jPJOwuRlyZcnB9qLv7P2/0I89t PNIA91JBPb9jt/+R1eXFHhzbMNBu9isSFdu6ozCpd55PsxNLsMUTyGBbSs6dolHh0OHjPH1ZBndhs 99Ry3plViZ5PsdGIRJ/q8pks+CLhF7ZKrgmxaxyqNlsG4n1m6W/K+gIjE1khdmsgAevk=; Received: from [192.168.2.1] (helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1j9aKy-002L7h-9A; Thu, 05 Mar 2020 01:39:48 +0530 From: Arun Isaac Date: Thu, 5 Mar 2020 01:39:45 +0530 Message-Id: <20200304200945.6657-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200304200945.6657-1-arunisaac@systemreboot.net> References: <20200304200945.6657-1-arunisaac@systemreboot.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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