From patchwork Tue Oct 27 19:15:28 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: 24833 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 24C6227BBF2; Tue, 27 Oct 2020 19:28:18 +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 EC9F927BBF3 for ; Tue, 27 Oct 2020 19:28:16 +0000 (GMT) Received: from localhost ([::1]:53464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXUdk-0003Zq-3o for patchwork@mira.cbaines.net; Tue, 27 Oct 2020 15:28:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXURu-0005BD-Ox for guix-patches@gnu.org; Tue, 27 Oct 2020 15:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34343) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXURu-0002pM-Ek for guix-patches@gnu.org; Tue, 27 Oct 2020 15:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kXURu-0002zC-7e for guix-patches@gnu.org; Tue, 27 Oct 2020 15:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39918] [PATCH v2 1/2] * gnu/packages/avr.scm (avr-gcc-7, avr-toolchain-7): New variables. 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:16: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.160382615311456 (code B ref 39918); Tue, 27 Oct 2020 19:16:02 +0000 Received: (at 39918) by debbugs.gnu.org; 27 Oct 2020 19:15:53 +0000 Received: from localhost ([127.0.0.1]:45886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXURd-0002yS-Bo for submit@debbugs.gnu.org; Tue, 27 Oct 2020 15:15:53 -0400 Received: from mail-ed1-f50.google.com ([209.85.208.50]:44960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXURa-0002yD-T4 for 39918@debbugs.gnu.org; Tue, 27 Oct 2020 15:15:44 -0400 Received: by mail-ed1-f50.google.com with SMTP id t20so2602633edr.11 for <39918@debbugs.gnu.org>; Tue, 27 Oct 2020 12:15:42 -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=mhlKjxHzHR8EE88xbcZC+1SzfYSEYUW4JdsiU7eYvp4=; b=GNHdazxRdgMWAWRN4435cC1jphkNc2OqzKXB6/shTTQt3eG1jVIslMEyq1IEsCT9/T c0YM+LpOj7oWaXJE0HaTfTK3aqqZwrX8zg/rSWYniaNTUEgt8E7Gc2gBwNLeyq1zFkt8 ulvLD8dWhdzwGk6AQndmLxuJ8p6DLq5GbuimBWQ8S66dNWfc+gjVMPnnyOzkIfUrLj3W v/QdEoBK4tZjBIEmNM/PFw++tQ+tkwOYDv/dUHTqRvdid3s2QXZMRP/51efDEp2RdSs7 n5jXxoseBC8J8UjBQ8TBL0Qp4GHDTQHAO7PKT4big3u2JOEpjWB12/TNVWzbhIrcFJ0k 49UA== 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=mhlKjxHzHR8EE88xbcZC+1SzfYSEYUW4JdsiU7eYvp4=; b=L1fwKbEn9S8bD+glhvTU7Cg+CAiVPuBHOWGbxVMrXdGWrCixGzaxzJZtozqqeZ1K0b ISJH2N9roAti1LtBBgQixn1jxvRC6KYR3/Grr1jdaoCnjPlkiuRAj5I6jwt4oM8+878O +NDfxwbGSCKoXe40JDAuC+jSqkikD/GqsPCQK+L2yAxxCr3UjwQ73z1geL+VH5veKWco TU3bCBiUbRKIpWTrTmXSiSf2xU59mh2j/h3jbr4/2tdm+TOiOHaoNnjL/2jlp5iOumvI tb50tRqId/CJMDB4OmIMXQfTxdiDGXbCFHtYz8W15Zk2z3+sQLjJFJ/v4Y/CVoYSLzL4 Ki9A== X-Gm-Message-State: AOAM532xtopVYrPrwhEKt8t2fBrx3tbvCj9OtDEseksDjhRZWCW2D76A 2vhTMR9USO2bBuRNSX8n4H82mDpnfmQ= X-Google-Smtp-Source: ABdhPJyIR95oAYbmUf8ZKhVOHOEpKOqTlBiweI+eTSBy5VQpWYGSWk26D9YsEVZx7AnDgbNQ1bxcLQ== X-Received: by 2002:aa7:d496:: with SMTP id b22mr4067202edr.123.1603826137078; Tue, 27 Oct 2020 12:15:37 -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 h8sm1519932edw.68.2020.10.27.12.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 12:15:36 -0700 (PDT) From: Malte Frank Gerdes Date: Tue, 27 Oct 2020 20:15:28 +0100 Message-Id: <20201027191529.12537-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 (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 ;;; 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@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