From mboxrd@z Thu Jan 1 00:00:00 1970 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 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-Message-ID: From: Arun Isaac Date: Thu, 5 Mar 2020 01:39:44 +0530 Message-Id: <20200304200945.6657-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39918@debbugs.gnu.org Cc: dannym@scratchpost.org, Arun Isaac , ekaitz@elenq.tech * 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 -- 2.25.1