From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id CCTRFpeWFmWYEAAAauVa8A:P1 (envelope-from ) for ; Fri, 29 Sep 2023 11:19:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id CCTRFpeWFmWYEAAAauVa8A (envelope-from ) for ; Fri, 29 Sep 2023 11:19:19 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 19B683CBE6 for ; Fri, 29 Sep 2023 11:19:19 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundationdevices.com header.s=google header.b=ExzlTs05; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695979159; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=goqWTk2lJyiaOTyLmk/quP7QQnhTgt/Ox/vioCkR53k=; b=b1TjZq6n9LyAfe0pBVLdFjN7SsER/vCpM3ui8EwtnBLeR8wlKHEk0R/T3PS1na8HZxByP1 Nr3cAsRIKf4NgaHqamRHZ1BY2/hLGKyxK4A7ATZLvj1L2RcLSKrSMjJF9cgI88AFP5UN+y Ft9vfpcz9lWTmrdfrzZW+uvgbJ9Ec6iIEEkpOy/qLeXP9aYhjJFwxCFVDH8/Nffu0d1WR0 Wqks+XnsFLaErJi8mVUIDfF6PcZ/wjtxLbwIVnPPX4wl2zhiGcbgEj5dHhrPpKzF2EKlFQ e+MDEoUgc6MlhV5ZITk9WOz9y8qFARFqd2VaXCSsB3KPjJah/SeH4lxuIO4N2A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundationdevices.com header.s=google header.b=ExzlTs05; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695979159; a=rsa-sha256; cv=none; b=JCqfGYfCcoWToL7j1hVnz7HNVr+gUxnsJJ18mYjX7+eg0xu6zPnIY3NG5r+6KtGM3zQS/V ZWtsX3Mj5GB1EohUGfAst2JCkircD3UL20xSreO6eeDFOfDZSKj9uql/3aEEbE94r5MFQa k1QntoNEsPMsqYpB4Kxh5RMW2pnVryyrGzAUuLuL4F0zUzJJgM/xa0E7UsWM863MfBoClV qBM25Xm3yAHRjriNN2PNvtmVQN0FfYGY1eOna/fR/wkcRlyoEcPhmP+WzlKU03YzByIR1k vgZmjkyY+viW8ng8+hzDH3A5/xE23To1Fz82UV73YR6RO1vYgKUM8/Cl/Q3lKg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dr-0005wb-CB; Fri, 29 Sep 2023 05:18:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9dE-0005UY-DY for guix-patches@gnu.org; Fri, 29 Sep 2023 05:18:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qm9d9-0003uY-Bz for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dN-0004mL-W1; Fri, 29 Sep 2023 05:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 12/23] gnu: Remove various AVR packages. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 29 Sep 2023 09:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66263@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , efraim@flashner.co.il, vagrant@debian.org, maxim.cournoyer@gmail.com X-Debbugs-Original-Xcc: efraim@flashner.co.il, vagrant@debian.org, maxim.cournoyer@gmail.com Received: via spool by 66263-submit@debbugs.gnu.org id=B66263.169597905018136 (code B ref 66263); Fri, 29 Sep 2023 09:18:05 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:30 +0000 Received: from localhost ([127.0.0.1]:55203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cn-0004iO-L3 for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:30 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:48330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cS-0004eV-TX for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:12 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-9a9cd066db5so1917198766b.0 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979008; x=1696583808; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=goqWTk2lJyiaOTyLmk/quP7QQnhTgt/Ox/vioCkR53k=; b=ExzlTs05PfTZjcj72YlPT5EGXJm9xrtlh+emHB5ZRbj5tTLCYDht7FpJEZRXBb7tmD D/iOyjogfhE0TsKXtNYvcr+Q5BD/OnOdIMQH6JmUNAU961myG/9QXePAeON8KcYYFEbO EottV2BAiJ0cAJOyAMDe0sEAmXP4iLDY1VaA+nlO1sA38SxkTl8oQWZ1iGN9fWTCuly+ JR/RVwINqj51YmMq74YYBADEO9Kywy+voklPKw8YFZ+VGaC3gVn3Za5vg2GZpkvG+ygd vErru0+DvH8uTHNsd0qC7T/9IJdELeTpcd1FkVZun0zG5JIc5CbPnVdMX+/U9+2bLmLy AbaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979008; x=1696583808; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=goqWTk2lJyiaOTyLmk/quP7QQnhTgt/Ox/vioCkR53k=; b=pSwF6EcLxXqlGycVHg6vvAn6rDD714I22+jJh/8iIzAaSykrpSA8Xnl+MPiuUVotcI 1PtDfv4lrXtmbyOFwnJaIyxjMDaODlpDitiMZddie7n0OKo4s28sYQYI5hyRLEVYQdmV 3se+iLTE6JWlB1tkNBWoxMbARXXj34UY8U0N0b8XL094VJwC9jDHcAAuh/ic3gFPUzOE 2D7Gh3BjGkdwCak0QKP5qyZ2c7qi8MJW/gziQgdLpxpyKazF5EAbfcrODv4floNDsmLS 8bcIa6T3yLMLDHn7L/LXi2uvB2Y1r6OLc8iReHfJcQAC+ZyvvBcAH+Qyck+jAxMnY6q5 Q60A== X-Gm-Message-State: AOJu0YwqGC47h5O8kEQ3AEIZPh7wtlOCwBg3CDqGl8SXpx+iL+GqPTAW aK6Q0ys/aePdSKiZIN9hEUJjhYKbHgukpjHcq/e2qg== X-Google-Smtp-Source: AGHT+IEE2rvXVzueFqJhZ5lrAodXjNNirFU2C5j5oLI9Nk+1ZASpFfVtx9vK2apZ4bFU1CDmL8I8ew== X-Received: by 2002:a17:906:76d9:b0:9ae:4eb7:ae8b with SMTP id q25-20020a17090676d900b009ae4eb7ae8bmr3356285ejn.7.1695979008160; Fri, 29 Sep 2023 02:16:48 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id k15-20020a7bc40f000000b004013797efb6sm1020933wmi.9.2023.09.29.02.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:47 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:16 +0200 Message-Id: <20230929091627.7820-12-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230929091627.7820-1-jean@foundationdevices.com> References: <20230929091627.7820-1-jean@foundationdevices.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches From: Jean-Pierre De Jesus DIAZ via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.70 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 19B683CBE6 X-Spam-Score: -4.70 X-TUID: S61i+SsF4fP1 * gnu/packages/avr.scm (avr-gcc): Remove variable. (avr-libc): Ditto. (avr-toolchain): Ditto. --- gnu/packages/avr.scm | 92 +++----------------------------------------- 1 file changed, 6 insertions(+), 86 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 97873a8691..e9b8e2b064 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -23,72 +23,16 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages avr) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix gexp) - #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages cross-base) + #:use-module (guix build-system gnu) #:use-module (guix download) - #:use-module (guix git-download) + #:use-module (guix gexp) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix build-system gnu) - #:use-module (guix build-system trivial) - #:use-module (gnu packages check) - #:use-module (gnu packages cross-base) - #:use-module (gnu packages flashing-tools) - #:use-module (gnu packages gcc) + #:use-module (guix utils) #:export (make-avr-libc)) -(define avr-gcc - (let ((xgcc (cross-gcc "avr" #:xbinutils avr-binutils))) - (package - (inherit xgcc) - (name "avr-gcc") - (arguments - (substitute-keyword-arguments (package-arguments xgcc) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Remove the default compiler from CPLUS_INCLUDE_PATH to - ;; prevent header conflict with the GCC from native-inputs. - (setenv "CPLUS_INCLUDE_PATH" - (string-join - (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH") - #\:)) - ":")) - (format #t - "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" - (getenv "CPLUS_INCLUDE_PATH"))))) - ;; Without a working multilib build, the resulting GCC lacks - ;; support for nearly every AVR chip. - (add-after 'unpack 'fix-genmultilib - (lambda _ - ;; patch-shebang doesn't work here because there are actually - ;; several scripts inside this script, each with a #!/bin/sh - ;; that needs patching. - (substitute* "gcc/genmultilib" - (("#!/bin/sh") (string-append "#!" (which "sh")))))))))) - (native-search-paths - (list (search-path-specification - (variable "CROSS_C_INCLUDE_PATH") - (files '("avr/include"))) - (search-path-specification - (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("avr/include"))) - (search-path-specification - (variable "CROSS_OBJC_INCLUDE_PATH") - (files '("avr/include"))) - (search-path-specification - (variable "CROSS_OBJCPLUS_INCLUDE_PATH") - (files '("avr/include"))) - (search-path-specification - (variable "CROSS_LIBRARY_PATH") - (files '("avr/lib"))))) - (native-inputs - `(("gcc" ,gcc) - ,@(package-native-inputs xgcc)))))) - (define* (make-avr-libc #:key (xbinutils (cross-binutils "avr")) (xgcc (cross-gcc "avr"))) @@ -117,27 +61,3 @@ (define* (make-avr-libc #:key for use with GCC on Atmel AVR microcontrollers.") (license (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt")))) - -(define avr-libc (make-avr-libc)) - -(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. - (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)))) -- 2.34.1