From patchwork Tue Oct 27 19:30:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Malte Frank Gerdes X-Patchwork-Id: 24834 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 B734727BBF3; Tue, 27 Oct 2020 19:31:20 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 ESMTPS id 0342F27BBF2 for ; Tue, 27 Oct 2020 19:31:20 +0000 (GMT) Received: from localhost ([::1]:32808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXUgg-0006r4-Vp for patchwork@mira.cbaines.net; Tue, 27 Oct 2020 15:31:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXUgT-0006mn-Om for guix-patches@gnu.org; Tue, 27 Oct 2020 15:31:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXUgQ-0005ET-Af for guix-patches@gnu.org; Tue, 27 Oct 2020 15:31:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kXUgQ-0003PC-7z for guix-patches@gnu.org; Tue, 27 Oct 2020 15:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39918] [PATCH v3 1/2] gnu: avr-gcc: Update to 7.5.0. References: <20200304200209.6309-1-arunisaac@systemreboot.net> In-Reply-To: <20200304200209.6309-1-arunisaac@systemreboot.net> Resent-From: Malte Frank Gerdes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Oct 2020 19:31: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: Malte Frank Gerdes Received: via spool by 39918-submit@debbugs.gnu.org id=B39918.160382703413017 (code B ref 39918); Tue, 27 Oct 2020 19:31:02 +0000 Received: (at 39918) by debbugs.gnu.org; 27 Oct 2020 19:30:34 +0000 Received: from localhost ([127.0.0.1]:45922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXUfu-0003No-Ej for submit@debbugs.gnu.org; Tue, 27 Oct 2020 15:30:34 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:42581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXUfs-0003NV-Hd for 39918@debbugs.gnu.org; Tue, 27 Oct 2020 15:30:29 -0400 Received: by mail-ed1-f65.google.com with SMTP id v19so2649866edx.9 for <39918@debbugs.gnu.org>; Tue, 27 Oct 2020 12:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lhXSd95W6+JiBr5+zJ00JepZpngPv5OGfsfUKZclpd0=; b=QWEyKd4WbSD1EQ7EUV2l1jG4nwLc6pxNM5lE5RRhghK/OvgHR6eGQjQBdkgoLnZ4jk o2o6P6p8xhjDm+Qrl4eAVHHbNY8CE6zSySFWLe6bFReIA0sw/DCls0vpnGeH+bCPxtIb Z98fthCT9Np7jCWQ0bLEEf7SFOvd8OCpk3MZBW/qJI0wjjLKLi2O3RXOBhTq346mXYza yrDgOdYeYZrAxE7sA8rl/bu0mQv/VSQ/MqwzrB2nsSAX5+Gt/k0+Ay97mJrePlSAmuHJ YgqOxvDLttcEqd+NzOe++/nX5nmRaHK2rpqZO8Z2zHWZWQaReFm4zGw5rLB2g2jlSmO4 XAYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lhXSd95W6+JiBr5+zJ00JepZpngPv5OGfsfUKZclpd0=; b=LFdzggiuBlu+CG1ioCYHKE2Y5sszK/rS2O6Ong7CaRpQXQgU8J0wJLMc5OcgdoTSt2 tNbw/lP4yhX42iyhv6GYcipL/TlD9QevmyNfD41k2U3kElKUx6DgcojxCWopfopDDaPf auQgfvALEyZqLmCdPEh364anrb9xViAd0pZDbBoG30VrFlj5kVJnS8zuuFtzhIXKRQ9F Imwh2lkx5ip0TfKWzwASaNxQP/t0teNjGTDLKSluC4hIlmCayOhlhTfGvuwYa4HkJEew U1re7uO9oN0hgktzOuAVMsj9HemDkOfZj2YOVfTCBFufJNtFYkl+kHy1kg+gQcujgp+W wY0Q== X-Gm-Message-State: AOAM532i9vfd0Q7pHjYi0CA55YT5euXxMmtrs7RtYkSYiuNvLa9N5rNQ slJGmEUmToxStJzy7M5yUjkPSr0juIQ= X-Google-Smtp-Source: ABdhPJxjn6Z+ZNQZnlSSrDTsva1YrYnBVjCknGrv1imkJ/4D16CYfubS7tKqdg33uajdrK7elckEwQ== X-Received: by 2002:aa7:cd14:: with SMTP id b20mr4084810edw.366.1603827022260; Tue, 27 Oct 2020 12:30:22 -0700 (PDT) Received: from Morphium.intus (ip-84-118-73-55.unity-media.net. [84.118.73.55]) by smtp.gmail.com with ESMTPSA id n10sm1486697edo.55.2020.10.27.12.30.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 12:30:21 -0700 (PDT) From: Malte Frank Gerdes Date: Tue, 27 Oct 2020 20:30:18 +0100 Message-Id: <20201027193019.15927-1-malte.f.gerdes@gmail.com> X-Mailer: git-send-email 2.29.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 76af6fdef1..573a5e089c 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Arun Isaac ; ;;; ;;; 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 From patchwork Tue Oct 27 19:30:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malte Frank Gerdes X-Patchwork-Id: 24835 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 3C6AB27BBF3; Tue, 27 Oct 2020 19:31:27 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 ESMTPS id 88C2927BBF2 for ; Tue, 27 Oct 2020 19:31:26 +0000 (GMT) Received: from localhost ([::1]:33382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXUgn-000770-M2 for patchwork@mira.cbaines.net; Tue, 27 Oct 2020 15:31:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXUgT-0006mp-PB for guix-patches@gnu.org; Tue, 27 Oct 2020 15:31:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34386) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXUgQ-0005EW-OP for guix-patches@gnu.org; Tue, 27 Oct 2020 15:31:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kXUgQ-0003PJ-LC for guix-patches@gnu.org; Tue, 27 Oct 2020 15:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39918] [PATCH v3 2/2] gnu: avr-toolchain: Replace functions with package variables. Resent-From: Malte Frank Gerdes Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Oct 2020 19:31: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: Malte Frank Gerdes Received: via spool by 39918-submit@debbugs.gnu.org id=B39918.160382703413025 (code B ref 39918); Tue, 27 Oct 2020 19:31:02 +0000 Received: (at 39918) by debbugs.gnu.org; 27 Oct 2020 19:30:34 +0000 Received: from localhost ([127.0.0.1]:45924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXUfy-0003Nu-5t for submit@debbugs.gnu.org; Tue, 27 Oct 2020 15:30:34 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:46867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXUfs-0003NX-TA for 39918@debbugs.gnu.org; Tue, 27 Oct 2020 15:30:29 -0400 Received: by mail-ed1-f66.google.com with SMTP id t11so52290edj.13 for <39918@debbugs.gnu.org>; Tue, 27 Oct 2020 12:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sNTUzjylihPf7o2vyshcoN2PFK7DJZyG6/QYaxRMtRs=; b=XixjFfleZTSwIOijhLLYvDfyrWa89kkl/i3q9KIE6vGpodlgvd64oLhl7fxtYwmowk NIn/m1L3svS8mMu68n1KWWE7xWB3SF2mRDYcMzlNsTMdNH6qj5VoKiro4AYBHVOQ1NPk 5QAoAqiSS+6TBjNyoPWhK7r9C2x9jKJv7bvfkcHsO+By71ZAGCTtUEec/6xOu6hOJRT3 yZBHwGLgrGiBqmmBpGrhtI4sCkPZumHMMGm86FDq2RxMfGzWKL0bX4QUxOKyOXZnO6Kt hQmPOmSFxgkHBaAYm7sch+70Kk4S+MtGK5tC8Y4W4HEYreF744u4RFrSTLlWJbuhdGKJ VV7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sNTUzjylihPf7o2vyshcoN2PFK7DJZyG6/QYaxRMtRs=; b=BYCaiUKDKZoj1xa5qsSxDon2htQGpiS0DQrb99aBA8FY0WnpEoeASW5QqP/Y6n5n0o t6wJAkSqiJsVMjCVinQzdsw80o1fgKOz8qA1cS3Cy1wghDBlYp4t44VXEx1rzC654P4y onl5LP5NDXC9s63yK1+e6EhBdtaC2Q0M6e2U4u1Fh3QeYLdDbo33ZEtoi/x+aHFJRLiS YVPTByzSWNQCZE3PJRVXqMq56Rixr5yb66aWxXVdJVVWsTSrGahS4Y7RkAXAgGdZ3NAj cPJDizczjn4lJr+w0hxnTz3xLzG0egukaisnadwBLVTCe0qVtLHKOcw/hwAYPHjEDi1/ /hhQ== X-Gm-Message-State: AOAM530MNiXtsHdo63usKC6GCpGlziGT/tTKl7OdMbDQo6ojcoZ0+IQT 1f+hTmaKzrcAu20guWucIbeupzNPFQY= X-Google-Smtp-Source: ABdhPJxTzSDBXTldVt66PX6KfgEKRpuW1pgx378ejuX+ZAvlLkiOcwSPuQO91pBsj9H3SOW074WyTQ== X-Received: by 2002:aa7:d702:: with SMTP id t2mr3816726edq.196.1603827023014; Tue, 27 Oct 2020 12:30:23 -0700 (PDT) Received: from Morphium.intus (ip-84-118-73-55.unity-media.net. [84.118.73.55]) by smtp.gmail.com with ESMTPSA id n10sm1486697edo.55.2020.10.27.12.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 12:30:22 -0700 (PDT) From: Malte Frank Gerdes Date: Tue, 27 Oct 2020 20:30:19 +0100 Message-Id: <20201027193019.15927-2-malte.f.gerdes@gmail.com> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027193019.15927-1-malte.f.gerdes@gmail.com> References: <20201027193019.15927-1-malte.f.gerdes@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 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