From patchwork Fri Sep 29 09:16:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54394 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 A2E7027BBEA; Fri, 29 Sep 2023 10:18:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 967E727BBE2 for ; Fri, 29 Sep 2023 10:18:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dO-0005bJ-2I; Fri, 29 Sep 2023 05:18:06 -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 1qm9dC-0005Ti-20 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:56 -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 1qm9d7-0003uF-Q8 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dM-0004lm-Ex; Fri, 29 Sep 2023 05:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 01/23] gnu: cross-libc: Return #f if no libc available. References: <20230929091333.7623-1-jean@foundationdevices.com> In-Reply-To: <20230929091333.7623-1-jean@foundationdevices.com> 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:04 +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.169597904818108 (code B ref 66263); Fri, 29 Sep 2023 09:18:04 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:28 +0000 Received: from localhost ([127.0.0.1]:55195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cl-0004hu-LY for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:28 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:44199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cI-0004di-EB for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:10 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-406618d0992so275975e9.0 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695978994; x=1696583794; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cOG/pzxU5SmzmUxtbGMIzsmMxINxsxe9+XUTkU4nf4U=; b=L4tUPnE77I3fsClL05bn+jUOE/dAXMF1usMHGOpOSBtHK34mUxrKNH5Mnpime7HoWr e2wrJHXqadRNZMrhXdK35zIkDWJArD9KVAuYgyBR4kiM/wDmMyQyGvOjsx8Aw4wdmMlp Rb2uNOJ84RGnw7UomZlo93bvYt5HFCybBhbgwOvk5XTS7zoTT8tdq+HE0/d+ABgxQFpu +goUP9Ed0nmtXUoGQlc2NxMoMQxsbrNdaPx9xj+Ysgtj2o1kTbjiRYWWa472UdTsxVmu XHVNhjtBTU2efSZsg21XqbYXpeNrit6asMapp6tv0x/X56hvtKC0q4yKK5xllLcBooNY 4sYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695978994; x=1696583794; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cOG/pzxU5SmzmUxtbGMIzsmMxINxsxe9+XUTkU4nf4U=; b=KlRbSry71cD+FBiPjp9EXUe+DX24uoepbGc5ToPL7oXfSw9yxbx//vHwfwJHfHUNj8 zczVWko2i95XtLxp+KMj1Cv2yqV6nTZKV/ZA2+aBKuMlUau9+EKUWRMmoG4yM6HFFJ4q RHCCOzXOis6GpHMguaCAHLZt/XlfDpBhed3SO8wzvUIxhRCLVLbFxaDQyKwC9zxXCKoj ZHkL0HWz6pBvoPfO6NkSOP5z7IY6PjdeskA7pAkcVK2VXMOn4+Z4pXFgVy4W+0zqxZZC LhWQGPk39N1Q/vuItoltYtxvmM7fDxCtt+vdDiuZDUlaxYvaqWq0ifgF6U1SOIK0H8i4 Vf/g== X-Gm-Message-State: AOJu0YzQi9qYW1B8IigRBgEMXIk+l003l0Zs2I9iWOwMrPudNpunmdSw rt+MH5nTLtq2k0af5E2mUfg/SUueJ8q0vmHm7NR6GQ== X-Google-Smtp-Source: AGHT+IGwcsjncPfF1pwtI6aEzGF2yeLBGdeD+n0IJviI66cGeColvzoeXoP2EKKI75amneQXAktjmA== X-Received: by 2002:a05:600c:2058:b0:405:95c3:e79d with SMTP id p24-20020a05600c205800b0040595c3e79dmr3499708wmg.40.1695978993583; Fri, 29 Sep 2023 02:16:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:33 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:05 +0200 Message-Id: <20230929091627.7820-1-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-base.scm (cross-libc): Return #f if platform does not have a libc available. --- gnu/packages/cross-base.scm | 138 +++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 67 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 14cb365099..f55765f1b0 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Josselin Poiret +;;; Copyright © 2023 Foundation Devices, Inc. ;;; ;;; This file is part of GNU Guix. ;;; @@ -611,73 +612,76 @@ (define* (cross-libc* target (xheaders (cross-kernel-headers target))) "Return LIBC cross-built for TARGET, a GNU triplet. Use XGCC and XBINUTILS and the cross tool chain." - (if (target-mingw? target) - (let ((machine (substring target 0 (string-index target #\-)))) - (make-mingw-w64 machine - #:xgcc xgcc - #:xbinutils xbinutils)) - (package - (inherit libc) - (name (string-append "glibc-cross-" target)) - (arguments - (substitute-keyword-arguments - `( ;; Disable stripping (see above.) - #:strip-binaries? #f - - ;; This package is used as a target input, but it should not have - ;; the usual cross-compilation inputs since that would include - ;; itself. - #:implicit-cross-inputs? #f - - ;; We need SRFI 26. - #:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-26)) - - ,@(package-arguments libc)) - ((#:configure-flags flags) - `(cons ,(string-append "--host=" target) - ,(if (target-hurd? target) - `(append (list "--disable-werror" - ,@%glibc/hurd-configure-flags) - ,flags) - flags))) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'set-cross-kernel-headers-path - (lambda* (#:key inputs #:allow-other-keys) - (let* ((kernel (assoc-ref inputs "kernel-headers")) - (cpath (string-append kernel "/include"))) - (for-each (cut setenv <> cpath) - ',%gcc-cross-include-paths) - (setenv "CROSS_LIBRARY_PATH" - (string-append kernel "/lib")) ; for Hurd's libihash - #t))) - ,@(if (target-hurd? target) - '((add-after 'install 'augment-libc.so - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libc.so") - (("/[^ ]+/lib/libc.so.0.3") - (string-append out "/lib/libc.so.0.3" - " libmachuser.so libhurduser.so")))) - #t))) - '()))))) - - ;; Shadow the native "kernel-headers" because glibc's recipe expects the - ;; "kernel-headers" input to point to the right thing. - (propagated-inputs `(("kernel-headers" ,xheaders))) - - (native-inputs `(("cross-gcc" ,xgcc) - ("cross-binutils" ,xbinutils) - ,@(if (target-hurd? target) - `(("cross-mig" - ,(cross-mig target - #:xgcc xgcc - #:xbinutils xbinutils))) - '()) - ,@(package-inputs libc) ;FIXME: static-bash - ,@(package-native-inputs libc)))))) + (match target + ((? target-mingw?) + (let ((machine (substring target 0 (string-index target #\-)))) + (make-mingw-w64 machine + #:xgcc xgcc + #:xbinutils xbinutils))) + ((or (? target-linux?) (? target-hurd?)) + (package + (inherit libc) + (name (string-append "glibc-cross-" target)) + (arguments + (substitute-keyword-arguments + `( ;; Disable stripping (see above.) + #:strip-binaries? #f + + ;; This package is used as a target input, but it should not have + ;; the usual cross-compilation inputs since that would include + ;; itself. + #:implicit-cross-inputs? #f + + ;; We need SRFI 26. + #:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) + + ,@(package-arguments libc)) + ((#:configure-flags flags) + `(cons ,(string-append "--host=" target) + ,(if (target-hurd? target) + `(append (list "--disable-werror" + ,@%glibc/hurd-configure-flags) + ,flags) + flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'set-cross-kernel-headers-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((kernel (assoc-ref inputs "kernel-headers")) + (cpath (string-append kernel "/include"))) + (for-each (cut setenv <> cpath) + ',%gcc-cross-include-paths) + (setenv "CROSS_LIBRARY_PATH" + (string-append kernel "/lib")) ; for Hurd's libihash + #t))) + ,@(if (target-hurd? target) + '((add-after 'install 'augment-libc.so + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/lib/libc.so") + (("/[^ ]+/lib/libc.so.0.3") + (string-append out "/lib/libc.so.0.3" + " libmachuser.so libhurduser.so")))) + #t))) + '()))))) + + ;; Shadow the native "kernel-headers" because glibc's recipe expects the + ;; "kernel-headers" input to point to the right thing. + (propagated-inputs `(("kernel-headers" ,xheaders))) + + (native-inputs `(("cross-gcc" ,xgcc) + ("cross-binutils" ,xbinutils) + ,@(if (target-hurd? target) + `(("cross-mig" + ,(cross-mig target + #:xgcc xgcc + #:xbinutils xbinutils))) + '()) + ,@(package-inputs libc) ;FIXME: static-bash + ,@(package-native-inputs libc))))) + (else #f))) ;;; Concrete cross tool chains are instantiated like this: From patchwork Fri Sep 29 09:16:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54389 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 2F65027BBE2; Fri, 29 Sep 2023 10:18:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BD66F27BBE9 for ; Fri, 29 Sep 2023 10:18:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dR-0005bk-SP; Fri, 29 Sep 2023 05:18:10 -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 1qm9dG-0005Ug-U1 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-0003uX-CM 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 1qm9dM-0004ly-U4; Fri, 29 Sep 2023 05:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 02/23] guix: gnu: Handle platforms without libc. 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:04 +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.169597904818116 (code B ref 66263); Fri, 29 Sep 2023 09:18:04 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:28 +0000 Received: from localhost ([127.0.0.1]:55197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cm-0004i1-97 for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:28 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:57848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cI-0004dk-0r for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:10 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40535597f01so140502085e9.3 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695978995; x=1696583795; 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=FCV+UtGUIkfq3vrLJDUKGfi83XI3U1/XET70FM9B/kw=; b=EaosmqFlA4+NVlM3BIbEEgKZwbT4DLGxPaGGWBG4jaLbN9DH7HhSaHNDUNvZW7VHTg yKqUeU9UBD+GrKb8pVDXIC8N5y4s2/MrAtMMmm98xDtJy4SotY7KY05wqEjlMbgVD9v2 LzyKN1AbppLwmsdX/B7S2w8iHIBYcVQ8VKJ6k2lWCfi/LP+rGgGU9kLyOdvoge+NDyqK BwqUwLwhualAG7CVPpBoK7mwop4XN4eqSCANjYSlrsKpts5OVmjBOIWqfa6hAeOLf/DG 9NXhEz+iagRHx2C6QQ9cuw3asS7CPmP+INRNQQ443mUUqFZ3hkSBIV+jSY8xdedsmNi8 E1ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695978995; x=1696583795; 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=FCV+UtGUIkfq3vrLJDUKGfi83XI3U1/XET70FM9B/kw=; b=Spd/8NnSvEQoD/ZjEmTFhyQ/8R8co98Z3Zc+bdEapvfQYfuybOjyub9C6bEJbJHo2F hB9UppFH18ifuK1fSz2Avj3C/spdIfHD3ZrplCthKawx1y/V6w+d6ef0zm51IXFkbGQt 9okuloGV1oPH2aI1JiwoPp3P78SDLijjVkoN2RUTEYbV+HDQjXP0FrUFUgHrSvU3Wg0L Z1AZbwURpeuT29vOABRlLH27kNHB9I8bLB0W/MuzSi+203qVSLRE3v1xVrTEYFY19mz7 3ikZhNDJvQ5KL1qefr1vTgDjtom0XZ1g4RkSVnJZ55xBnVeyV55uG2eCxrQHKh1xkfCI YAbA== X-Gm-Message-State: AOJu0YyUVQTiAFwqr5cjZMGcY5rmwiV7E6kW2RndFAlfzMo/vKnZCYNK G2dxqdMkNl397wGjqglVrjKIx76KgjVdey9mwwnJFQ== X-Google-Smtp-Source: AGHT+IHuDnfzuPAsOC8wA0qGCZwKHP6BtyMhLCfSSgbpWcQCwcabN8Ze84MFCCoqafJ+g1IPGdjCVQ== X-Received: by 2002:a05:600c:204:b0:3fe:fc0f:52e2 with SMTP id 4-20020a05600c020400b003fefc0f52e2mr3467862wmi.37.1695978995086; Fri, 29 Sep 2023 02:16:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:34 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:06 +0200 Message-Id: <20230929091627.7820-2-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build-system/gnu.scm (standard-cross-packages): Do not add cross-libc as an input if the system doesn't support a libc. --- guix/build-system/gnu.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index c1aa187c42..03a742f8b9 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -460,11 +460,15 @@ (define standard-cross-packages `(("cross-gcc" ,(gcc target #:xbinutils (binutils target) #:libc libc)) - ("cross-libc" ,libc) - ;; MinGW's libc doesn't have a "static" output. - ,@(if (member "static" (package-outputs libc)) - `(("cross-libc:static" ,libc "static")) + ;; Some targets don't have a libc. + ,@(if libc + `(("cross-libc" ,libc) + + ;; MinGW's libc doesn't have a "static" output. + ,@(if (member "static" (package-outputs libc)) + `(("cross-libc:static" ,libc "static")) + '())) '())))))))) (define* (gnu-cross-build name From patchwork Fri Sep 29 09:16:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54401 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 2213027BBE9; Fri, 29 Sep 2023 10:19:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1466E27BBE2 for ; Fri, 29 Sep 2023 10:19:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9ds-0005xd-A3; Fri, 29 Sep 2023 05:18:36 -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 1qm9dF-0005Tv-1A 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 1qm9d8-0003uJ-2R for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dK-0004lA-SI; Fri, 29 Sep 2023 05:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 03/23] gnu: Add avr platform. 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:02 +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.169597903418007 (code B ref 66263); Fri, 29 Sep 2023 09:18:02 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:14 +0000 Received: from localhost ([127.0.0.1]:55178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cX-0004gB-LC for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:14 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:53291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cI-0004dn-FQ for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:09 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-406402933edso55389885e9.2 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695978997; x=1696583797; 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=43nNmeMVytxt9k6yfDIf0x1/PoQOFB2ENxLRaFX1usc=; b=aFvloha5fSGXS1YGq8wTFq5N+4MZr8cieVb2j7BhyGt0qa99AI77LtR5y9eST6DfGJ HyzJvv96arByRpCPO7XCm9bKyLqjYFzbmfwGDJOQ5U/Idv4Oc/qowB3jEGk9EQL8FvLd gBM8JCWnpxOT79T1P3+n8+XLuf6aREp1fh0y/fHReaeXh0Le/DQHTU9xiMfEYfNCHL2W u0ekVdm3ZrVXAIpIWN1/P5z05kDZGTCs1Z6GCaSTtPYSyl9mLnVyv2UatAc6dPdqqmoI BOWsdk6VLzHVI5ipxQpuAXWUf2QzpcgSNi3BmFnvmzA69fdlRoCq2TqZ6o6m5a0cUhh8 grZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695978997; x=1696583797; 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=43nNmeMVytxt9k6yfDIf0x1/PoQOFB2ENxLRaFX1usc=; b=DhartgpmGrSMomY9Nr4mLryu0AeT0YiAkAo9wcwJArTWfwmr/JYtihVNsM1SmEmp8p gaRE7pyRnQkNP6Ym1Ygc4DPCjrUN+N9MN95OXszssLklNgO+hTCL1V/z8u7N0Y91PpbX 75QMi2/ubVQTUM6UJUr/xZDRxnRNb9CXImLTzOi6Wq2clVRnXcliePn/2Fj1SSxuprnl 2uGoi+aYt9gOknBuD4URvwNN1dVpMCr435haHzpYZEndB7BMqBNKMORLiCRgSFnS375J +Ua9canzrNHXio8a+U9uhzbWyRdNIvkX/4lRUfgGOvSz3bvnIYFkJKH6mdjbmM/gXjSn he1Q== X-Gm-Message-State: AOJu0YxyjWNRSZsEQ2qxtFilq6rotmhoeZ/WWzKMVfALJjawPcp0rLc2 RX/z32RcwSX4TKAo6yvCEIgRkYLNoqns4G/G6UIaKg== X-Google-Smtp-Source: AGHT+IHd8nfOXYN0HRoHcmXLek9QhT8Y30H85VD2sOKKvYgG3tisRC/FM1myQ1Qur5Cj6Zbpy5s2Rg== X-Received: by 2002:a05:600c:3786:b0:405:359a:c965 with SMTP id o6-20020a05600c378600b00405359ac965mr3308022wmr.4.1695978996822; Fri, 29 Sep 2023 02:16:36 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:36 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:07 +0200 Message-Id: <20230929091627.7820-3-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * Makefile.am (MODULES): Add avr platform module. * doc/guix.texi: Add documentation for avr platform. * guix/platforms/avr.scm (avr): New variable. --- Makefile.am | 1 + doc/guix.texi | 6 ++++++ guix/platforms/avr.scm | 29 +++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 guix/platforms/avr.scm diff --git a/Makefile.am b/Makefile.am index 8924974e8a..c11a1c538d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,6 +136,7 @@ MODULES = \ guix/ipfs.scm \ guix/platform.scm \ guix/platforms/arm.scm \ + guix/platforms/avr.scm \ guix/platforms/mips.scm \ guix/platforms/powerpc.scm \ guix/platforms/riscv.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 46591b2f64..70cde9c53c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16665,6 +16665,7 @@ The available targets are: - aarch64-linux-gnu - arm-linux-gnueabihf + - avr - i586-pc-gnu - i686-linux-gnu - i686-w64-mingw32 @@ -45332,6 +45333,11 @@ Platform targeting x86 CPU running GNU/Hurd (also referred to as ``GNU''). @end defvar +@defvar avr +Platform targeting AVR CPUs without an operating system, with run-time support +from AVR Libc. +@end defvar + @node System Images @chapter Creating System Images diff --git a/guix/platforms/avr.scm b/guix/platforms/avr.scm new file mode 100644 index 0000000000..b6ca6e4a10 --- /dev/null +++ b/guix/platforms/avr.scm @@ -0,0 +1,29 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Foundation Devices, Inc. +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix platforms avr) + #:use-module (guix platform) + #:use-module (guix records) + #:export (avr)) + +(define avr + (platform + (target "avr") + (system #f) + (glibc-dynamic-linker #f))) + From patchwork Fri Sep 29 09:16:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54393 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 4C93327BBEA; Fri, 29 Sep 2023 10:18:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E8E9D27BBE2 for ; Fri, 29 Sep 2023 10:18:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dK-0005Wu-GX; Fri, 29 Sep 2023 05:18:04 -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 1qm9d7-0005SV-3I for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:51 -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 1qm9d6-0003u1-Rn for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dK-0004l4-GX; Fri, 29 Sep 2023 05:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 04/23] guix: utils: Add target-avr?. 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:02 +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.169597903317994 (code B ref 66263); Fri, 29 Sep 2023 09:18:02 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:13 +0000 Received: from localhost ([127.0.0.1]:55175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cW-0004fh-3Y for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:13 -0400 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]:56819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cM-0004du-HQ for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:09 -0400 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-5041bb9ce51so21854970e87.1 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695978998; x=1696583798; 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=CsgqduFhNDliwjaZuh0YLSyXui8IMz/a3w4p93ybbeY=; b=IO27oih6orNRU5g1a/HDqOZ3Ls1vsQ1xmhsURjMGNhz93OfmQIH8D0qmvDCwJQoIxP r0xwsMN5aBJXMscRHr5RybSdQJXmFDyWyWEt8yR8uGgVA21mdYeSrQBjSp8k6yWrT9x1 Pkg8d9qefx7oSY/zegx5dLLgjhKd6v2TCPEMQns+KxO+M3UMlXqNKhI/tMXAaVGedUdQ z+9N67psMXe0Sdpa2XyiboqE0uqijQfjm6WGn5/hpHO0KlBP7LXnhZpm0OrNEUJfmJAY 3D9mbRi5Nm++Y1jljxB3tFB40TAZlMQmpuUX6gnOBfLDBFE8aQrfyo4CsGdnyRFhATUM /aNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695978998; x=1696583798; 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=CsgqduFhNDliwjaZuh0YLSyXui8IMz/a3w4p93ybbeY=; b=Gw0dzVDttnB6aGqdfhwJ6v6rNFuUIymcRlVOZphOZJ4cmoTGBTNA8gg/dVpZXSAnbk eURMriRvf252M0BUPCGMvmn5VjGRS1TH0R3Pg7hwkzUmAOl+f3koExQfQ7NJDF/1mDrO JjaLRYhk8s2n2o/XAEhfAangoQkj7ZwR1Us324KGxgjBg1yNMrOWadXZ0AR7x/C3+BTB WNtk/zVzSKCJeUJRF1RWEkUHkG4IspXSv5gaA1GhZ4Xp00RswwFNmDdydRUnepNMSXDx WJSBre+H4QtXTTqrC93fVPaAVlY0BY9z+fk8pHrMMLikcPcCW0PWNTwPSVBJrLwZRaSx 4YMw== X-Gm-Message-State: AOJu0YzKCWb4rNR7w/uGWYOlHdfVIooPwar9XrKIg2INYRqi8kTZNQY+ BolKN/3wYMAxHyvKpSA6sKWxFKaqYwb2WYg6qycB0w== X-Google-Smtp-Source: AGHT+IG0oi9j2kRMyiHrnFIYemGisqatWwDBRzK+vSsewj5ocw+uqC45c0SpZY4vhZfU1UhAk7MjBQ== X-Received: by 2002:a05:6512:e9b:b0:4ff:9efd:8a9e with SMTP id bi27-20020a0565120e9b00b004ff9efd8a9emr3730116lfb.7.1695978998429; Fri, 29 Sep 2023 02:16:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:38 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:08 +0200 Message-Id: <20230929091627.7820-4-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/utils.scm (target-avr?): New procedure. --- guix/utils.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index e9af33bdeb..1724b53149 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -98,6 +98,7 @@ (define-module (guix utils) target-arm32? target-aarch64? target-arm? + target-avr? target-ppc32? target-ppc64le? target-powerpc? @@ -722,6 +723,9 @@ (define* (target-arm? #:optional (target (or (%current-target-system) (%current-system)))) (or (target-arm32? target) (target-aarch64? target))) +(define* (target-avr? #:optional (target (%current-target-system))) + (string-prefix? "avr" target)) + (define* (target-ppc32? #:optional (target (or (%current-target-system) (%current-system)))) (string-prefix? "powerpc-" target)) From patchwork Fri Sep 29 09:16:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54387 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 C56E727BBE9; Fri, 29 Sep 2023 10:18:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B735527BBE2 for ; Fri, 29 Sep 2023 10:18:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dI-0005UZ-TM; Fri, 29 Sep 2023 05:18:02 -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 1qm9d6-0005SU-Qc for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:51 -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 1qm9d6-0003tw-Iq for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dL-0004lH-83; Fri, 29 Sep 2023 05:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 05/23] gnu: cross-gcc: Enable multilib for avr. 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:03 +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.169597903518014 (code B ref 66263); Fri, 29 Sep 2023 09:18:03 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:15 +0000 Received: from localhost ([127.0.0.1]:55181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cY-0004gO-HI for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:14 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:53631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cM-0004dv-Hy for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:09 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4053c6f0db8so133747335e9.3 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979000; x=1696583800; 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=3Tmr9YlDYp4sxolPKptevR6pMJkVG+GvEjNbzj73Nx0=; b=DOTT/SRobUyKPZXQ8wUcYAA4+LmrE3CQWYVxSwQYO7jKbiQjitbHMVIPH3W2NyOMRB L1O5KN0r//Z5bwfxx/wVvyK+ghwMLa7p4KMHJGSojhzptLXFWBKGicSK3En78Fq2ioNt ViM4JJUuMfmffvkeOQ/lDearxoyLmsGZU4NlSpKdneqjG/OgxZ/hcVKEvoKRWq7nNOFm snB2hUY1FP88pRCS2DecDLPu5CJ3OPt+4+6ofxc7JOjbGJcqVk/Hq1bG8A1K3q+qmq3k ORCzXEilmOgMKCkxZRtqmYVfv4CfqFmwavJhioZXvWqHYZ7jPVe7oiNlp1+ibgiblMya 7liQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979000; x=1696583800; 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=3Tmr9YlDYp4sxolPKptevR6pMJkVG+GvEjNbzj73Nx0=; b=mI2rIEHaI82y1AS7E/ExjuGOdj7qWTkjhcA7Gym2CgDaPuZvUlGOkM2mfRrDCbdiRj T2uWTwFcWxbK10ha+NFgTr/taBS0ZMXBQvpqVdky/9W+SEK5+pXeuSL6XuyE7YiWFbfC fULAxLCPMzW0ZfWBnW2CaANctSGvFlPsjHmR1ITJNUb+5AJEZUNGt3w0IcF1l99PZH4L AqNrIxl/NMZ5g+LHeHr/+IG0FwygigO3T8vo45lJwufkKe2YrKsiqDj+d/J5v5rphNo/ zy6oP9I10wV6AWLPmi77ESUnP05VMkzTee1y6lRYhzPmssU/mfVwOjC5tgF1nXQCykJg yesQ== X-Gm-Message-State: AOJu0Yx8DdV6k0WpJrW5kxSdOVv/r6T/UUwKkB0RYHUqF+GYdvzXqf9+ Fud5x+ref40O4RbzltUXfv5ryFOqV/0jbWFGGFp3rg== X-Google-Smtp-Source: AGHT+IEXdn7dYhe8SXdIb8+GgrzeDc4cnq0q9K6X7pjjfRBXYKR9nOsFxwUCjCzomprD6T9BWS2AcQ== X-Received: by 2002:a05:600c:2286:b0:3fd:2e89:31bd with SMTP id 6-20020a05600c228600b003fd2e8931bdmr3358502wmf.14.1695978999678; Fri, 29 Sep 2023 02:16:39 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:39 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:09 +0200 Message-Id: <20230929091627.7820-5-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-base.scm (cross-gcc-arguments) [target-avr?]: Remove --disable-mutlilib and add --enable-multilib. --- gnu/packages/avr.scm | 4 +--- gnu/packages/cross-base.scm | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index b9bee5e624..e976203b89 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -75,9 +75,7 @@ (define avr-gcc ;; several scripts inside this script, each with a #!/bin/sh ;; that needs patching. (substitute* "gcc/genmultilib" - (("#!/bin/sh") (string-append "#!" (which "sh")))))))) - ((#:configure-flags flags) - #~(delete "--disable-multilib" #$flags)))) + (("#!/bin/sh") (string-append "#!" (which "sh")))))))))) (native-search-paths (list (search-path-specification (variable "CROSS_C_INCLUDE_PATH") diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index f55765f1b0..ec7ca2186d 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -197,12 +197,21 @@ (define (cross-gcc-arguments target xgcc libc) #~((string-append "--with-toolexeclibdir=" (assoc-ref %outputs "lib") "/" #$target "/lib")) + #~()) + + #$@(if (target-avr? target) + #~("--enable-multilib") + #~()) + #~())) - #$(if libc - flags - #~(remove (cut string-match "--enable-languages.*" <>) - #$flags)))) + (remove + (lambda (flag) + (or (and (string-match "--enable-languages.*" flag) + #$libc) + (and (string-match "--disable-multilib" flag) + #$(target-avr? target)))) + #$flags))) ((#:make-flags flags) (if libc #~(let ((libc (assoc-ref %build-inputs "libc"))) From patchwork Fri Sep 29 09:16:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54409 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 BBAEE27BBE2; Fri, 29 Sep 2023 10:19:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ADBA927BBE9 for ; Fri, 29 Sep 2023 10:19:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9da-0005f7-3H; Fri, 29 Sep 2023 05:18:18 -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 1qm9dC-0005Tk-2G for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:56 -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 1qm9d8-0003uL-B8 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dM-0004ld-0P; Fri, 29 Sep 2023 05:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 06/23] gnu: microscheme: Move to avr-xyz. 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:03 +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.169597904718100 (code B ref 66263); Fri, 29 Sep 2023 09:18:03 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:27 +0000 Received: from localhost ([127.0.0.1]:55193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cl-0004hm-4g for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:27 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:50367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cM-0004dw-TV for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:10 -0400 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-50336768615so23166294e87.0 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979001; x=1696583801; 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=cvGHDlsyj+RwjuNpvfOGJLp5v3QnOkVD/245YwXDXOU=; b=Z80H1ZXFAdA0sCJjrR0opiPkI3v+tJSnoJdAhEFvSyGS8xEonTwNlHuXg031d0w4Sa UxWRQ7lFJVtcAiadjk23XBYaxBJ2cDyKEJ/EcbEphqJGjse83VE80aNzbDT7M/1wPy+J lfOrKLqD8g5R7s3MInsUIhR604MKwCWXom41MlHApx46OyyQiVKjzDfDEOOwcPL2uZ08 fixraTSOjGvRajQBmOs1y7azBgD5dUiOg2DHqD5y8ciqcWrjkANBpPoiKgCQyMkrYOIz 98hjWXHKVEahqVXoibygbTF4NxXQBibXauz9PRty1A1J8qjRDU1YuCOPfGutwD0VjQ4M qVTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979001; x=1696583801; 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=cvGHDlsyj+RwjuNpvfOGJLp5v3QnOkVD/245YwXDXOU=; b=d+ebSTM/wfaVwVSuJVlBdUeaxnKHPOrmz/OIy3z6umvwHhjhP1lBa/6y1llqDGmH94 Ynkd2yUmTfdBeEmxlRczB7E/4BMWISQtM6LwsqZOMA5goF3wqtwWn0OEeloFfIZNVkmP A2Dm8+9cAI1JOPUSCqT7sjf8S2/YHLuxDOecfQzxIAlZ6TXKKjvYd7Uhx29CZ1xkW3rt M2f/rogfyCF4mOxKBme3DTduZjqQp5M0X5Nm9CsVkhGJqx6Yf3HxfdRY8F1xY/uRoGmy MxBIkl2AEWXKpggUYtAC3LHPtp7HYlKs4LhdemVD0aczLPu2VL52Q7HbCEJSwx5PD1Vw vfaw== X-Gm-Message-State: AOJu0Yz1jcXcHrtHwpeIddlN0h0owOZscmAFXpBgFk1Q4rU9b73XLJoB 1dqoeAR/Zf6pxkZ9HmSkCDbK9lXcNTVR4dY+k+btLw== X-Google-Smtp-Source: AGHT+IEv6c5duH1REQXK80kbIC6dwk6pv0pd4xf2GZtVEIPlF1qO+08Y4IuO5FLHTgW8NsDjMxo6QA== X-Received: by 2002:a05:6512:68f:b0:500:b553:c09e with SMTP id t15-20020a056512068f00b00500b553c09emr3778626lfe.32.1695979001155; Fri, 29 Sep 2023 02:16:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:40 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:10 +0200 Message-Id: <20230929091627.7820-6-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/avr.scm (microscheme): Remove from file. * gnu/packages/avr-xyz.scm (microscheme): New variable. --- gnu/packages/avr-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++ gnu/packages/avr.scm | 42 +--------------------------------------- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/gnu/packages/avr-xyz.scm b/gnu/packages/avr-xyz.scm index a05157ede7..771753b5e4 100644 --- a/gnu/packages/avr-xyz.scm +++ b/gnu/packages/avr-xyz.scm @@ -28,14 +28,55 @@ (define-module (gnu packages avr-xyz) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages avr) #:use-module (gnu packages elf) #:use-module (gnu packages gl) + #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ncurses) #:use-module (gnu packages version-control) + #:use-module (gnu packages vim) #:use-module (gnu packages ruby)) +(define-public microscheme + (package + (name "microscheme") + (version "0.9.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ryansuchocki/microscheme") + (commit (string-append "v" version)))) + (sha256 + (base32 "1bflwirpcd58bngbs6hgjfwxl894ni2gpdd4pj10pm2mjhyj5dgw")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:parallel-build? #f ; fails to build otherwise + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure)) + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (native-inputs + (list clang cppcheck unzip xxd)) + (home-page "https://github.com/ryansuchocki/microscheme/") + (synopsis "Scheme subset for Atmel microcontrollers") + (description + "Microscheme, or @code{(ms)} for short, is a functional programming +language for the Arduino, and for Atmel 8-bit AVR microcontrollers in general. +Microscheme is a subset of Scheme, in the sense that every valid @code{(ms)} +program is also a valid Scheme program (with the exception of Arduino +hardware-specific primitives). The @code{(ms)} compiler performs function +inlining, and features an aggressive tree-shaker, eliminating unused top-level +definitions. Microscheme has a robust @dfn{Foreign Function Interface} (FFI) +meaning that C code may be invoked directly from (ms) programs.") + (license license:expat))) + (define-public simavr (package (name "simavr") diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index e976203b89..ccce686010 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -32,12 +32,9 @@ (define-module (gnu packages avr) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages check) - #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) #:use-module (gnu packages flashing-tools) - #:use-module (gnu packages gcc) - #:use-module (gnu packages llvm) - #:use-module (gnu packages vim)) + #:use-module (gnu packages gcc)) (define-public avr-binutils (package @@ -142,40 +139,3 @@ (define-public avr-toolchain C++.") (home-page (package-home-page avr-libc)) (license (package-license avr-gcc)))) - -(define-public microscheme - (package - (name "microscheme") - (version "0.9.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ryansuchocki/microscheme") - (commit (string-append "v" version)))) - (sha256 - (base32 "1bflwirpcd58bngbs6hgjfwxl894ni2gpdd4pj10pm2mjhyj5dgw")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `(#:parallel-build? #f ; fails to build otherwise - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure)) - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) - (native-inputs - (list clang cppcheck unzip xxd)) - (home-page "https://github.com/ryansuchocki/microscheme/") - (synopsis "Scheme subset for Atmel microcontrollers") - (description - "Microscheme, or @code{(ms)} for short, is a functional programming -language for the Arduino, and for Atmel 8-bit AVR microcontrollers in general. -Microscheme is a subset of Scheme, in the sense that every valid @code{(ms)} -program is also a valid Scheme program (with the exception of Arduino -hardware-specific primitives). The @code{(ms)} compiler performs function -inlining, and features an aggressive tree-shaker, eliminating unused top-level -definitions. Microscheme has a robust @dfn{Foreign Function Interface} (FFI) -meaning that C code may be invoked directly from (ms) programs.") - (license license:expat))) From patchwork Fri Sep 29 09:16:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54405 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 5EE1727BBEA; Fri, 29 Sep 2023 10:19:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E15427BBE2 for ; Fri, 29 Sep 2023 10:19:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9ds-0005xX-6Q; Fri, 29 Sep 2023 05:18:36 -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 1qm9dH-0005Ui-VE 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 1qm9d8-0003uT-U1 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-0004m9-Bq; Fri, 29 Sep 2023 05:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 07/23] gnu: Add AVR phases to cross-gcc-build-phases. 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.169597904918124 (code B ref 66263); Fri, 29 Sep 2023 09:18:05 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:29 +0000 Received: from localhost ([127.0.0.1]:55199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cm-0004i8-KC for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:28 -0400 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]:55575) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cN-0004dy-7f for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:11 -0400 Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2c00e1d4c08so224297401fa.3 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979002; x=1696583802; 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=v8cpt2jTu38Jk6y5Yzrz2fJnsovdFNlpDLG20zKhlEM=; b=T2xqI+cKggZ1I6slqxY/StL7p5UX9l0oYxorG8TI2/LbmcvCotZzcJuxU7yk72h38L yJRqc2nZINcCpNZlLWg4b6m65EWmasuhoIvIa7a2U8/AyL4g5pQWVnttXvpOkfDrp/vH 6ZlSbf2wQfc9P8B0ygI0QD3NP91KE09UXYSGr3i2a9EhKZ6Zei7LljQoU3+mjWQ1iDtq vE29FACP4v+FNSWG7iCUehFLoY/Xs2hjXdOJe8a03z7M7aNDRKtS3U6ij6Dxri825HRF LMeNr9vFDW98DTkUOUizNlDi8JOJaNGk6m8PTXSWTqQgOr3FnYi7dNa3EywFgtHBgvLq yvgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979002; x=1696583802; 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=v8cpt2jTu38Jk6y5Yzrz2fJnsovdFNlpDLG20zKhlEM=; b=SsIYXvR/BvjnYAwHXGEgcSzdxr7ysRWyKNhAVacYyyGqzVSYmM9U9H1VHP7tdyxccP vwJH79uy6XOI49XEAY2vdLMF4T9FYLufmmiCP0r9jc0nBEehGZQHGmwRyDIsH3uiBMYM 9sK9d1eNZ6JbVMclTs4eXwIshQlv0J0lDZ20mMH0pyZdWpiwGIf511fYAm362fg+uojr Gmv6vWpEJz715kVBAP5uBSkPrKoWG5ZphsyjqLR5bia5Q+ssnD72PttRUrfqSFuBkAnt kxNt1uFbMCovEC/Z1yq9XCH/G4E5iOXSWDxFUEYPxk3Bc3GClJT4d2n9MY93unjYrhsQ hueA== X-Gm-Message-State: AOJu0YxqeJfk3ecCtlNCWg9zAU2/91EIAfo3bp8vTWcRPIYJty6XWcRx 6s7d9O0lpQTGhEKsNCcd1Hwq2ZtJRVx3ijbZ9J4FsQ== X-Google-Smtp-Source: AGHT+IEUlgd6IIt9k0Xf0IV0NpVgOxI2UYp5EBhkjcJYgy2OR+kJq28yqKdqhfRRrk4xFVqp4sNi4g== X-Received: by 2002:a05:6512:10cd:b0:503:5d8:da33 with SMTP id k13-20020a05651210cd00b0050305d8da33mr3496990lfg.20.1695979002409; Fri, 29 Sep 2023 02:16:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:42 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:11 +0200 Message-Id: <20230929091627.7820-7-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/build/cross-toolchain.scm (set-cross-path/avr): New procedure. * gnu/build/cross-toolchain.scm (cross-gcc-build-phases): Add case for AVR target. --- gnu/build/cross-toolchain.scm | 41 +++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm index 9746be3e50..8de62be593 100644 --- a/gnu/build/cross-toolchain.scm +++ b/gnu/build/cross-toolchain.scm @@ -97,6 +97,31 @@ (define (cross? x) ;; We're building the sans-libc cross-compiler, so nothing to do. #t))) +(define* (set-cross-path/avr #:key inputs #:allow-other-keys) + (match (assoc-ref inputs "libc") + ((? string? libc) + (define (cross? x) + ;; Return #t if X is a cross-libc. + (string-prefix? libc x)) + + (let ((cpath (string-append libc "/avr/include"))) + (for-each (cut setenv <> cpath) + %gcc-cross-include-paths)) + + (setenv "CROSS_LIBRARY_PATH" + (string-append libc "/avr/lib")) + + (for-each (lambda (var) + (and=> (getenv var) + (lambda (value) + (let* ((path (search-path-as-string->list value)) + (native-path (list->search-path-as-string + (remove cross? path) ":"))) + (setenv var native-path))))) + (cons "LIBRARY_PATH" %gcc-include-paths))) + ;; AVR sans-libc cross-compiler. + (else #t))) + (define* (set-cross-path/mingw #:key inputs target #:allow-other-keys) "Add the cross MinGW headers to CROSS_C_*_INCLUDE_PATH, and remove them from C_*INCLUDE_PATH." @@ -174,13 +199,15 @@ (define* (cross-gcc-build-phases target a target triplet." (modify-phases phases (add-before 'configure 'set-cross-path - ;; This mingw32 target checking logic should match that of target-mingw? - ;; in (guix utils), but (guix utils) is too large too copy over to the - ;; build side entirely and for now we have no way to select variables to - ;; copy over. See (gnu packages cross-base) for more details. - (if (string-suffix? "-mingw32" target) - (cut set-cross-path/mingw #:target target <...>) - set-cross-path)) + (cond + ;; This mingw32 target checking logic should match that of target-mingw? + ;; in (guix utils), but (guix utils) is too large too copy over to the + ;; build side entirely and for now we have no way to select variables to + ;; copy over. See (gnu packages cross-base) for more details. + ((string-suffix? "-mingw32" target) + (cut set-cross-path/mingw #:target target <...>)) + ((string-prefix? "avr" target) set-cross-path/avr) + (else set-cross-path))) (add-after 'install 'make-cross-binutils-visible (cut make-cross-binutils-visible #:target target <...>)) (replace 'install install-strip))) From patchwork Fri Sep 29 09:16:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54402 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 47C5227BBE2; Fri, 29 Sep 2023 10:19:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 68BAB27BBEA for ; Fri, 29 Sep 2023 10:19:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9do-0005tC-9g; Fri, 29 Sep 2023 05:18:32 -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 1qm9dC-0005Tj-2E for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:56 -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 1qm9d8-0003uN-MC for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dL-0004lV-KU; Fri, 29 Sep 2023 05:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 08/23] gnu: avr-libc: Convert to procedure. 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:03 +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.169597904718093 (code B ref 66263); Fri, 29 Sep 2023 09:18:03 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:27 +0000 Received: from localhost ([127.0.0.1]:55191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9ck-0004hf-Mz for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:27 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:50311) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cO-0004e0-2K for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:10 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40537481094so142852485e9.0 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979003; x=1696583803; 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=0T1YlvkTt4ZTTrG1komOFsRH2lm8bvYzKkzHy12r9go=; b=LyYDm75poVc2J1yY4KVjzxJ5sfz+/ZUxkAvXLDzgsyiZE63TaBXF13wo5lLklKMZ9u 9EEFHH7yeMON1r9xJ5KRKJvGOmjKJogs9IpIUDZ6wZ6Yu9OZfKxAaox15GCfhyqsFk8d 9viY253Fl+UHBeHe3A/MGSp3YWtTryrqymGhvoqGvj8neKd9M+pi9W/bUNxOi1NZ3KQM koPHj4A1DPyQxlrt2H7bxdCwoa0CfB+CEK5DnL3s3evchzDp/1lhUjO8a2Xk6V2YQNcR 1jrQAYTczbCUYGGvjngMO+Qss6rGBXWcp/bKEhdq+mEpQ2sPzkDAJsaIlwSxsGwJJ+EY v6bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979003; x=1696583803; 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=0T1YlvkTt4ZTTrG1komOFsRH2lm8bvYzKkzHy12r9go=; b=jqwP+IhUaszOd5yiQeRPOFkqivqnG0WZ7z4yqK8X3co9ij8vnn1hUZ6WwzlIU5m6F3 jmLHwq7hFnSgUDSLypGe2mbdxvkIj4AdEWlA/cAMUJTzeNwwFNh1wpiungUbxqTLNxfg 8pcejSJ18kpUARmKTx7mNZOXVwVaF5J+8UQ7e/X9qQk2xMeDxQc4eNr7CVFeUay8KG47 HoGyMbWpuyS/F8CGHklblfgxAeOjblNmae25EkR3/WvF6vLDKYeTIUi4V309jJ/W1yUZ enF2ovP2JVIzEekZSaQzBqMxBH2EHCCJuoZLk4k16+pEyrucCnxn2o+vIY7/6B77EenK Ixnw== X-Gm-Message-State: AOJu0YxxDHRBMsVyzYY3+8OiqKdnf5jp0SlRjjhCtk38O1tZx2TwAOP+ vswbCaq3wijLojd1y1USxplMkdLs3dIB5BW5dFqztQ== X-Google-Smtp-Source: AGHT+IHzgcT0I7EKJsKBLS5LHM9yYVU9fCpmEbKQ2SrrP3wH/Wq+VsBZDlyoZ/pUbIic0BQUdooC8A== X-Received: by 2002:a05:600c:b5a:b0:406:3c2b:8639 with SMTP id k26-20020a05600c0b5a00b004063c2b8639mr3130801wmr.30.1695979003507; Fri, 29 Sep 2023 02:16:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:43 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:12 +0200 Message-Id: <20230929091627.7820-8-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/avr.scm (make-avr-libc): New procedure. * gnu/packages/avr.scm (avr-libc): Use make-avr-libc procedure. --- gnu/packages/avr.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index ccce686010..df1523274b 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -34,7 +34,8 @@ (define-module (gnu packages avr) #:use-module (gnu packages check) #:use-module (gnu packages cross-base) #:use-module (gnu packages flashing-tools) - #:use-module (gnu packages gcc)) + #:use-module (gnu packages gcc) + #:export (make-avr-libc)) (define-public avr-binutils (package @@ -93,7 +94,9 @@ (define avr-gcc `(("gcc" ,gcc) ,@(package-native-inputs xgcc)))))) -(define avr-libc +(define* (make-avr-libc #:key + (xbinutils (cross-binutils "avr")) + (xgcc (cross-gcc "avr"))) (package (name "avr-libc") (version "2.0.0") @@ -106,10 +109,12 @@ (define avr-libc "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj")))) (build-system gnu-build-system) (arguments - '(#:out-of-source? #t - #:configure-flags '("--host=avr"))) - (native-inputs `(("avr-binutils" ,avr-binutils) - ("avr-gcc" ,avr-gcc))) + (list #:target "avr" + + #:out-of-source? #t + + #:implicit-cross-inputs? #f)) + (native-inputs (list xbinutils xgcc)) (home-page "https://www.nongnu.org/avr-libc/") (synopsis "The AVR C Library") (description @@ -118,6 +123,8 @@ (define avr-libc (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. From patchwork Fri Sep 29 09:16:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54391 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 EF83527BBEA; Fri, 29 Sep 2023 10:18:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 99DD227BBEB for ; Fri, 29 Sep 2023 10:18:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dq-0005tJ-2o; Fri, 29 Sep 2023 05:18:34 -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 1qm9dI-0005W9-PQ 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 1qm9dD-0003vb-SF for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dR-0004ng-AH; Fri, 29 Sep 2023 05:18:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 09/23] gnu: Add make-cross-gcc-toolchain. 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:09 +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.169597906718218 (code B ref 66263); Fri, 29 Sep 2023 09:18:09 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:47 +0000 Received: from localhost ([127.0.0.1]:55220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9d1-0004jb-Oa for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:47 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:52583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cP-0004e2-6t for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:18 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-405524e6740so120861665e9.1 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979004; x=1696583804; 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=lySh2JlWDrWJVGoYb6pOzfnxiKVxkvtsIQ5uUjoc9ds=; b=VCtcR2dmPaNTT9sEK+/Wq3yM0gdp6cJmnDuShlPwu0EEr/kIznRKZNdOjRrm7/OD92 ujxlBiMc4YZ2z4RwRKd+9vs1HO0H8/QmxdbRUOSV6bih30AuoHHs85Mp1XHHWmIPgT0f WPxJS2CIyvaNG9z8zD1CnzLs4cuREDXV/+lgqzzgcdjpDyBQMj7dBceJ3sePxDGBmp7R ElSNwZ8K0XF5exHJMcxoNekEub9wgm8bV9uQDQxjqDxPFXZvHM223wwSCwYhmbYTX3LI vKwBn6bKFElucH945JLFCJyodDQlorrhhxnarrNdUdHrjMQ6s5YSDTm7fXigX1bj0Ve7 /vJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979004; x=1696583804; 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=lySh2JlWDrWJVGoYb6pOzfnxiKVxkvtsIQ5uUjoc9ds=; b=aNRwowM1OFicJZrM/HMuPlKRMyXLWYNXtUHRxU36iKhq84CkSQtAyVWLOOsyyswSmQ Wu+1PTruR7phtJXZUYN5K1pjpXK9HG6RgHStLQoGTvwI4nkfoYh091IB3p+ymsCEsgGx WN6adfi/srLWf5NYgNToULR0hU5t7w8jsl9j8/pSCTCU6i4BtQhSUg3XLCP8+xC+tAkl zN5zOh+woCoOpLf8qHh7WgotJeVGCow+4bjXVjBbu9a7TUuw0Qw4zsHwJ5pBr9ArItbt Gh8Y+wxjfjPFlsCRWygj4qxcm8JnHk5ghZAhpRVqtSFcmijGwbX29K1krPRBuS/Ns7ZS GZnA== X-Gm-Message-State: AOJu0Yxx2SgVlqDGctYSOVH9AwkDrjG7u+5lzZtG7DD+K/O48rWtYeiJ 0O54GfvVwkYh74pL9+DMyr5E42L1RhIiKIQpyniRSA== X-Google-Smtp-Source: AGHT+IGfxH3UwxkGOJsNxSmIGt/+X1rof9QCvxNyqmuNKdnNXTOFDNAb4G172fuHE8K6KnLxiWg4vA== X-Received: by 2002:a05:600c:2492:b0:405:3e9a:f1e3 with SMTP id 18-20020a05600c249200b004053e9af1e3mr3508733wms.11.1695979004622; Fri, 29 Sep 2023 02:16:44 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:44 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:13 +0200 Message-Id: <20230929091627.7820-9-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-toolchain.scm (make-cross-gcc-toolchain): New procedure. --- gnu/local.mk | 1 + gnu/packages/cross-toolchain.scm | 58 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 gnu/packages/cross-toolchain.scm diff --git a/gnu/local.mk b/gnu/local.mk index bfa816d717..bdd3af5080 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -197,6 +197,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/crates-graphics.scm \ %D%/packages/crates-gtk.scm \ %D%/packages/cross-base.scm \ + %D%/packages/cross-toolchain.scm \ %D%/packages/crypto.scm \ %D%/packages/cryptsetup.scm \ %D%/packages/cups.scm \ diff --git a/gnu/packages/cross-toolchain.scm b/gnu/packages/cross-toolchain.scm new file mode 100644 index 0000000000..0062d043a0 --- /dev/null +++ b/gnu/packages/cross-toolchain.scm @@ -0,0 +1,58 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Foundation Devices, Inc. +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages cross-toolchain) + #:use-module (gnu packages avr) + #:use-module (gnu packages cross-base) + #:use-module (guix build-system trivial) + #:use-module (guix packages) + #:use-module (srfi srfi-1) + #:export (make-cross-gcc-toolchain)) + +(define* (make-cross-gcc-toolchain target + #:key + (libc (cross-libc target)) + (xgcc (cross-gcc target #:libc libc)) + (xbinutils (cross-binutils target))) + (package + (name (string-append (package-name xgcc) "-toolchain")) + (version (package-version xgcc)) + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build union)) + #:builder (begin + (use-modules (ice-9 match) + (guix build union)) + + (match %build-inputs + (((names . directory) ...) + (union-build (assoc-ref %outputs "out") directory)))))) + (inputs (list xgcc xbinutils libc)) + (native-search-paths (package-native-search-paths xgcc)) + (search-paths (package-search-paths xgcc)) + (properties (alist-delete 'hidden? (package-properties xgcc))) + (license (package-license xgcc)) + (synopsis (string-append "Complete GCC tool chain for C/C++ development (" + target ")")) + (description + "This package provides a complete GCC cross tool chain for C/C++ +development to be installed in user profiles. This includes GCC, as well as +libc (headers and binaries), and Binutils. GCC is the GNU Compiler +Collection.") + (home-page "https://gcc.gnu.org/"))) From patchwork Fri Sep 29 09:16:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54399 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 75AB227BBE2; Fri, 29 Sep 2023 10:19:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5A57827BBE9 for ; Fri, 29 Sep 2023 10:19:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9do-0005sJ-1A; Fri, 29 Sep 2023 05:18:32 -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 1qm9dI-0005WN-R7 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:18:01 -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 1qm9dF-0003w0-9r for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dT-0004od-U9; Fri, 29 Sep 2023 05:18:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 10/23] gnu: Add binutils-cross-avr. 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:11 +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.169597907518270 (code B ref 66263); Fri, 29 Sep 2023 09:18:11 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:55 +0000 Received: from localhost ([127.0.0.1]:55232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9dD-0004kW-7l for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:55 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:47104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cQ-0004eE-9s for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:25 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-406618d0991so281795e9.2 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979006; x=1696583806; 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=OwMhSKRjQtsHKmKrUr5z50qHWDCtpI6Okv/jF+BnGN0=; b=D/m/TmR4pLpglTihvnZLGU9leL5LMYFntb9sDHSVtatLDkzXeYMOBXqz71CIITAR2g L2UOEcGKK6eXQSJ6PMSnkpra63lKEqfX0ODXu8oZ9hUBSBfZwzf0IAVvGGuJojcF62Ld 9WhOUjAVXfZmE9iA7N94Gbeq9zpoHRZi1zpn1lagJGG/S+3vCnRgm9TN/gt2ARbxj8r6 kJgOh4RptC1KD/Azf5PImmgJeMNbbFJ5RaukTGy2DBQO75Kq0DJTWyukwXVWaCo4Ni5b LWSJbTNZMv8Y395kcspDoNir80M5PwPCXJOdBS38xRBDgLAfrihVPKvfTLXSE9iVVNhk HGHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979006; x=1696583806; 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=OwMhSKRjQtsHKmKrUr5z50qHWDCtpI6Okv/jF+BnGN0=; b=jFhHh/fgZH0jQGwB1KH74IakQj/sgjAtNiAMU6exBhatda+hPAm0KB3JMtd9LBGB9C sAxn348HpyrPRN5TWzvahNUrHpGVBVWQCvP/f5tSgsb4N5e6kbNBzhihW4tRD60bb2AR 9vTtRs3DMI93OJUNL/dmGRESQADAz87yLqGL853NJMm5Mb8qyd6kt6mbnO0gAQnMP/Ok T6SPWcPpcHxbe0wVmjkHiziwpgLmdgF78bXxQkZtO9o+jhGMI0XsA6XacFnWIyOp38w0 Y7SoGcUQv0v7c28YeDOYMFnNqpluUfiRNHmPHtskldZ+E9fTOzej5Fuq6eqRIC5WZAun DKQg== X-Gm-Message-State: AOJu0Yw0H2t68N4q5oPv6mfuay0CUZtMzAiaGmpj67/jWRHsrEaKC/Xt MAljT60Jt1Q1YfDI8ySlujDvR06Ky9RQoVUmsxdwGw== X-Google-Smtp-Source: AGHT+IE7x5OvLTcjBWLqxRap/9q8/mZMhLP1+NpwULfNjJHre99dsQlDNSpkVri9k3suJIRaDk9DXQ== X-Received: by 2002:a05:600c:220d:b0:405:3455:567e with SMTP id z13-20020a05600c220d00b004053455567emr3137909wml.5.1695979005826; Fri, 29 Sep 2023 02:16:45 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:45 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:14 +0200 Message-Id: <20230929091627.7820-10-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-toolchain.scm (binutils-cross-avr): New variable. --- gnu/packages/cross-toolchain.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/cross-toolchain.scm b/gnu/packages/cross-toolchain.scm index 0062d043a0..5617959851 100644 --- a/gnu/packages/cross-toolchain.scm +++ b/gnu/packages/cross-toolchain.scm @@ -56,3 +56,8 @@ (define* (make-cross-gcc-toolchain target libc (headers and binaries), and Binutils. GCC is the GNU Compiler Collection.") (home-page "https://gcc.gnu.org/"))) + +;;; Cross binutils: + +(define-public binutils-cross-avr + (cross-binutils "avr")) From patchwork Fri Sep 29 09:16:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54395 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 E842D27BBE9; Fri, 29 Sep 2023 10:18:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 204A427BBE2 for ; Fri, 29 Sep 2023 10:18:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9de-0005iP-3G; Fri, 29 Sep 2023 05:18:22 -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 1qm9dI-0005WK-Qs 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 1qm9dB-0003uv-S0 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dQ-0004nM-G1; Fri, 29 Sep 2023 05:18:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 11/23] gnu: avr-binutils: Deprecate package. 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:08 +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.169597906318198 (code B ref 66263); Fri, 29 Sep 2023 09:18:08 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:43 +0000 Received: from localhost ([127.0.0.1]:55216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cx-0004jG-1Y for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:42 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:51533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cR-0004eT-Ce for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:16 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40572aeb73cso109687195e9.3 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979007; x=1696583807; 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=C9mYa0TbjrzIkXI4LwWLpCLHjn8EzVK3j3Dms8ng2BE=; b=BULBeDOlgyO94w0CiEvM3f93p18uyYHLEr6YAE6TjKqxiKNLFeyaLFg6fjwXNIA5o5 gG9gttDd8Nbrbq/VQ3VNJjv0o+vqU+o1XG2Tl5hw95ohAMiuv/5g8Lknnb/lZqM0aJmQ TCviv/wpnEJyH/8DTLdiFosgaCI56qfIROtuGCp+uSibM5G9NTREVfVPA37mZdYyhCAY S3LcIq85rVPWkq5Qw01vqt64WYUSCLcLg6FYWNW12CHEgJDstErFITjSjDlUtEP0uPYE AFyonYPQczZRubetrzzqJfyN7dEtZ1SmDcX5R6QzNT7BV5LRWB9fGrByMQjsEfMgASXP w/PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979007; x=1696583807; 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=C9mYa0TbjrzIkXI4LwWLpCLHjn8EzVK3j3Dms8ng2BE=; b=ppcMW/khHoun73S5xdjYpJ9uEC4DwHepxb3c0G49u1ZNTYXtcfL+nSp2dRNzVDdG6i Tz4YgDBHtmrHs+MZrVwaOCCdjA+308703Xmuimb8r2ksKVYK69n9j5pZ93ZkDyvRkeSp dRS1057TxkDtOs6eMG6/7qMcvu/lGrC2eDFmmdAUUQPaC747uDvOlsIR67Lb6ildj+AJ 6MHstgBWc9htA740rPhFlugHEmcCE162b57nDwTUqS3p9WhpmoQDC6hnkY5N7TiZoreX iZtIIvGSXcTlIZhFTSZlrroP0+pSaSRoVqblIpjab1fj4Q8NKBPnVVZbEYbx8yI9Lk86 Ntdg== X-Gm-Message-State: AOJu0YwiBgkYdjx8ea+MlzRyME3rYWExAroQNT1hZc4lJ9OOn1u+u8kP h25cBHQpWh4GpQRDOx1E0aTGJ5gyWgDabfsIa5azWA== X-Google-Smtp-Source: AGHT+IHmFTxNCQ8Iwq0/WrK1ily3vPjzLwdWKHRplS+UityVgxsjn8rG/OaL/LMal12T8dvYDA+/qA== X-Received: by 2002:a05:600c:3d1a:b0:406:548e:bd51 with SMTP id bh26-20020a05600c3d1a00b00406548ebd51mr2582139wmb.26.1695979006870; Fri, 29 Sep 2023 02:16:46 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:46 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:15 +0200 Message-Id: <20230929091627.7820-11-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/avr.scm (avr-binutils): Delete variable. * gnu/packages/cross-toolchain.scm (avr-binutils): New deprecated variable. --- gnu/packages/avr.scm | 5 ----- gnu/packages/cross-toolchain.scm | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index df1523274b..97873a8691 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -37,11 +37,6 @@ (define-module (gnu packages avr) #:use-module (gnu packages gcc) #:export (make-avr-libc)) -(define-public avr-binutils - (package - (inherit (cross-binutils "avr")) - (name "avr-binutils"))) - (define avr-gcc (let ((xgcc (cross-gcc "avr" #:xbinutils avr-binutils))) (package diff --git a/gnu/packages/cross-toolchain.scm b/gnu/packages/cross-toolchain.scm index 5617959851..77af6b862b 100644 --- a/gnu/packages/cross-toolchain.scm +++ b/gnu/packages/cross-toolchain.scm @@ -20,6 +20,7 @@ (define-module (gnu packages cross-toolchain) #:use-module (gnu packages avr) #:use-module (gnu packages cross-base) #:use-module (guix build-system trivial) + #:use-module (guix deprecation) #:use-module (guix packages) #:use-module (srfi srfi-1) #:export (make-cross-gcc-toolchain)) @@ -61,3 +62,6 @@ (define* (make-cross-gcc-toolchain target (define-public binutils-cross-avr (cross-binutils "avr")) + +(define-deprecated/public avr-binutils binutils-cross-avr + (deprecated-package "avr-binutils" binutils-cross-avr)) From patchwork Fri Sep 29 09:16:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54407 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 182C927BBE2; Fri, 29 Sep 2023 10:19:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EF6DA27BBEA for ; Fri, 29 Sep 2023 10:19:18 +0100 (BST) 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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)))) From patchwork Fri Sep 29 09:16:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54396 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 97D1E27BBEA; Fri, 29 Sep 2023 10:18:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 16A7B27BBE2 for ; Fri, 29 Sep 2023 10:18:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9de-0005kU-Nl; Fri, 29 Sep 2023 05:18:22 -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 1qm9dH-0005Vt-V6 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 1qm9dA-0003ud-4d 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 1qm9dO-0004me-PT; Fri, 29 Sep 2023 05:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 13/23] gnu: cross-libc: Add AVR Libc case. 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:06 +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.169597905418155 (code B ref 66263); Fri, 29 Sep 2023 09:18:06 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:34 +0000 Received: from localhost ([127.0.0.1]:55208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cs-0004ie-2U for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:34 -0400 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]:46357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cT-0004eX-Ub for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:12 -0400 Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2c02e232c48so229827181fa.1 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979009; x=1696583809; 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=/pe7YpfnjAAXFJoCSkJusfhVvkiy9KxONm/2NlHqh8k=; b=YVI9clgSKCx0c1ixeSYdKEB2ZoPiItNKXx5YPeqpJW+9lVDwhg2LU1HLO82qd9t2Gg yCshg69KZZf1nupWRD3XA6YGpNrjDbzFNtK1XjwNxS/rbhPO4Q4JbSy4kOVYwnXjegYE 9gB7XZxnaIU9lNR4iGBq/JYUt7zAwLlen3O/Jtw1iAjoZQ6AKAVcIGzrkIzyHboql8Qr 2AKEarXPEvzM+zhOV6Luj0izjSa1FUde0KCG7b1dGwg+HLXB2tPU56Hgfd3/HeX1Nfov XOc/TilDEnDgxPXCZr5y4WnboRrap9ZKFWL7DwvHeMCn0rqvTiYUHDX60ixORBB8UoNU iVvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979009; x=1696583809; 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=/pe7YpfnjAAXFJoCSkJusfhVvkiy9KxONm/2NlHqh8k=; b=LJFf3S9aZM4BWlKtKz4Ol5StAip4aXKKzN17SO/t39F6CbX0ve2FvXc9gGCK8fxySr OXpDWpdfRRWIpbq+7rwqXVtu1hmxV73aVsYAemCL33N0dwDCE4JczWlBTUGy9UouOPv8 y9EhhwUVYwq9T4ytPO1sM9HqTp8ihDYGeC81gdKtt2P6WmAlW0idcgr1PY7D40Ug1mUg B3RhiXkwHZvzlVxyeHjUm85aaOg6hHP1twSEC4JBjPTJjRc2nObxhfXVnLNgl3Ei7Zjm fSZ6etxsMfXVVmg62YNBylI+MF+kcAtlu432KrdwVSIv2Euc83KB06VVxalvnG20CoXm Creg== X-Gm-Message-State: AOJu0YyAbKBI+F2cMmtRVCbDariyjW4vK6UQHCXBCoebqOiyT02hW/19 XsXmHJw9MoeqGLy5IJDCCbx8mU9Ag4D6YQiszOGE7w== X-Google-Smtp-Source: AGHT+IGecKd2aGkLxsjRU//Zbgh6CBcl+o6XikjjIyP0tIoMoRtGgdTcgncGxOgG1m/BJ2FSaVl9uA== X-Received: by 2002:a05:6512:3685:b0:503:17d6:7dac with SMTP id d5-20020a056512368500b0050317d67dacmr2742432lfs.42.1695979009227; Fri, 29 Sep 2023 02:16:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:48 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:17 +0200 Message-Id: <20230929091627.7820-13-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-base.scm (cross-libc): Handle the AVR target case and return AVR Libc package. --- gnu/packages/cross-base.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index ec7ca2186d..fc21e7c4fd 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -28,6 +28,7 @@ (define-module (gnu packages cross-base) #:use-module (gnu packages) + #:use-module (gnu packages avr) #:use-module (gnu packages gcc) #:use-module (gnu packages base) #:use-module (gnu packages linux) @@ -622,6 +623,8 @@ (define* (cross-libc* target "Return LIBC cross-built for TARGET, a GNU triplet. Use XGCC and XBINUTILS and the cross tool chain." (match target + ((? target-avr?) + (make-avr-libc #:xgcc xgcc #:xbinutils xbinutils)) ((? target-mingw?) (let ((machine (substring target 0 (string-index target #\-)))) (make-mingw-w64 machine From patchwork Fri Sep 29 09:16:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54406 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 5E02327BBEC; Fri, 29 Sep 2023 10:19:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4760427BBE2 for ; Fri, 29 Sep 2023 10:19:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dr-0005wm-Kp; 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 1qm9dG-0005Uh-Ty 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 1qm9dA-0003uj-KK 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 1qm9dO-0004mU-D5; Fri, 29 Sep 2023 05:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 14/23] gnu: cross-gcc-arguments: Handle AVR target. 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:06 +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.169597905418147 (code B ref 66263); Fri, 29 Sep 2023 09:18:06 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:34 +0000 Received: from localhost ([127.0.0.1]:55206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9co-0004iT-5Z for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:34 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:55601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cU-0004eZ-Rx for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:12 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40528376459so142574965e9.3 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979010; x=1696583810; 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=ZRQJVpelh3QbJW9lwGQ4hvwsLadwfndLJJ4N+/M+z04=; b=H4hbKZ2CdQB/e1BxRkdFj71D2YIHGwI8ZmDKJibHK3NRt1GWdP9BBFnH16OwmAvvpa oODjy7U5FffaSUed8WwrPI9ttlprqZUf5w0aZEjAhnXaK7TFLvzoZNQ2sX8Io23Qnj3K +qGjQyJXQAOgx8sm25yW2/o4H8v8IqBmaTz/kKzYPloN3DRcnJ28P8HBUy0s6aqaVRon 7xm+Vv5hZe3ArSQpXpdKvwJto2U5VB8R3hsdNFOZXvXa5JcyNurRfh3ryonnaTPxEk43 D39GhalubgzthrBxhIpdpikYAJB+F+GAFR1mlK77VmCXaHfkwHCIul8torc1/l3vAXUW f1zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979010; x=1696583810; 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=ZRQJVpelh3QbJW9lwGQ4hvwsLadwfndLJJ4N+/M+z04=; b=mnsiBcrRLLQqpr1IsmCPU7yR7/bhPOL1emtfc41cy1FJFrFjeDCTdS1x8USeKqo3Ft NrcBRoau15Q6E+Ab0yJ53ONzpfT+1cXZ2Kpo4SRiuuvqBgoZRSDv6GerQtTW+clmp7T/ 5SstmJI5WwQmcL+D3m+0ZmZ+N7vEn5QGBn2DiSoFjyE5SFAVUaeLgXV2j31uZJJUI/LP rB8N9YYFmybgX5veTCatf/3F3UtsU08bqMBu2MZm/FacwBXVrei+iq85FwA5fyTJrlfh M4v9y2rOzvt4dBVi7KYY4Iajh7nRTx3LSnW++isNms6ljkpRAGoulJvSWkpBd2nydGyR KyQg== X-Gm-Message-State: AOJu0YxZ+WvzlAuYc1u8quVLnsxgmk6eimatex17DgUAVIAzrDLWdI/E uC/artS+VX4pZ8eanMaF10umbvB+2OyWlFjVA9Fm6g== X-Google-Smtp-Source: AGHT+IHSwXfY6cgznAYtEaobAnfRRahfcY9x1t6+MW9Ju6JZpt6GeEZAlZEz38XkCC3vm05Hhgms7w== X-Received: by 2002:a05:600c:22d1:b0:405:3251:47a1 with SMTP id 17-20020a05600c22d100b00405325147a1mr3358192wmg.40.1695979010317; Fri, 29 Sep 2023 02:16:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:50 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:18 +0200 Message-Id: <20230929091627.7820-14-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-base.scm (cross-gcc-arguments): Handle AVR target. --- gnu/packages/cross-base.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index fc21e7c4fd..10d912b755 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -204,23 +204,38 @@ (define (cross-gcc-arguments target xgcc libc) #~("--enable-multilib") #~()) + #$@(if (and libc (target-avr? target)) + #~("--enable-languages=c,c++" + (string-append "--with-native-system-header-dir=" + #$libc "/avr/include" )) #~())) (remove (lambda (flag) (or (and (string-match "--enable-languages.*" flag) #$libc) + (and (string-match "--with-native-system-header-dir.*" + flag) + #$libc + #$(target-avr? target)) (and (string-match "--disable-multilib" flag) #$(target-avr? target)))) #$flags))) ((#:make-flags flags) - (if libc - #~(let ((libc (assoc-ref %build-inputs "libc"))) + (cond + ((and (target-avr? target) libc) + #~(let ((libc (assoc-ref %build-inputs "libc"))) ;; FLAGS_FOR_TARGET are needed for the target libraries to receive ;; the -Bxxx for the startfiles. - (cons (string-append "FLAGS_FOR_TARGET=-B" libc "/lib") - #$flags)) - flags)) + (cons (string-append "FLAGS_FOR_TARGET=-B" libc "/avr/lib") + #$flags))) + (libc + #~(let ((libc (assoc-ref %build-inputs "libc"))) + ;; FLAGS_FOR_TARGET are needed for the target libraries to receive + ;; the -Bxxx for the startfiles. + (cons (string-append "FLAGS_FOR_TARGET=-B" libc "/lib") + #$flags))) + (else flags))) ((#:phases phases) #~(cross-gcc-build-phases #$target #$phases)))))) From patchwork Fri Sep 29 09:16:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54408 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 2B9C827BBE2; Fri, 29 Sep 2023 10:19:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5B6B127BBE9 for ; Fri, 29 Sep 2023 10:19:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9ds-0005yK-Of; Fri, 29 Sep 2023 05:18:36 -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 1qm9dH-0005Vv-V7 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 1qm9dA-0003ui-IS 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 1qm9dP-0004mn-6h; Fri, 29 Sep 2023 05:18:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 15/23] guix: meson-configuration: Fix boolean assigment. 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:07 +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.169597905418163 (code B ref 66263); Fri, 29 Sep 2023 09:18:07 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:34 +0000 Received: from localhost ([127.0.0.1]:55210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cs-0004im-D2 for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:34 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:49193) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cV-0004ed-Rg for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:13 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-406618d080eso279505e9.2 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979011; x=1696583811; 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=H2UCtvHWHG6LI8tf3DTHDXN3qtWDwkJLuV4m7uyrUBk=; b=U2DZDCpnwAfR9BujB5OSupAomttQvuXOZqIn/f9G4P8uXHSJRGeu/9vxA9H7RGqPe2 WACIOFLjghmSk8yIYJNottzawEE3sQQzCj3vvD2YjOWunutcExRYMzqbYCmFq9W8nZhI uYQTlCjuqTy7n+A7/tFRbmmg+YqUo5iOz00SpCDvtYsOTA7z8Jx42NgmmqM3BfsF/TPm V9Yi2ql8I7kRV5ikxmBMYD3fkSEonae0lw0JNWhG75o0Ma/ad7BBo5bfMWgGBsV8Lk/Z qoQS9NdDWJU6sJdIZaX8oKwWbd0bOkCG/QW3tzByO4L0WTiCxrxW5xcFyfNDQrhzeuJs XqLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979011; x=1696583811; 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=H2UCtvHWHG6LI8tf3DTHDXN3qtWDwkJLuV4m7uyrUBk=; b=aX6pPvn8U+o/C2sjtYhmra4zVywccHU4AANGATvGRbwRibTU8I8nP/anqJkQ4Wdfbm xWG4/BMeBddk+c0c2Jittxsrlr6E2boL3cegut9egomButoFBYI9OB4fN5y+YxjTaBXs 59RCEsYZGd0Jj4zmPXTGY9bfLSbW2yIqdI1MoETj/7t3PRwbyYvcw71/pUYpYlEWsRH+ dtVzMAPPV3ZMxM1hjVBpsrts7bxvb+wVp1sXvqSRT/aC3LyeWthxtnX3r66GzO40rsYn Gz0Hi8TXjnhvj/tFam27Wx+6gQ2DPL80bwIOmGxhDBFyMO+UbG0kbX6ZpSMjPaMiyQqa cEJg== X-Gm-Message-State: AOJu0YwKfsbxY7jNtSn7E3iq/OBcZWMDr9vUa2GJ88iuWKw3F2IG5auX d4+lYmK+s8s3SUQyQ2TY48k8RNJPvYFk2wA5YJYISw== X-Google-Smtp-Source: AGHT+IFraTMUoFnS86fixC8xoUEjA49dPEBKSq5G4mpKN2npXK/a8FM4iks4Bp4Tf6GzBibxoGmZpg== X-Received: by 2002:a05:600c:b4e:b0:402:95a0:b2ae with SMTP id k14-20020a05600c0b4e00b0040295a0b2aemr3345132wmr.32.1695979011297; Fri, 29 Sep 2023 02:16:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:51 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:19 +0200 Message-Id: <20230929091627.7820-15-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build/meson-configuration.scm (write-assigment): Print true for #t and false for #f. Previously it was inverting the values. --- guix/build/meson-configuration.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/meson-configuration.scm b/guix/build/meson-configuration.scm index 1aac5f8f0a..5e194d4c2b 100644 --- a/guix/build/meson-configuration.scm +++ b/guix/build/meson-configuration.scm @@ -43,9 +43,9 @@ (define (write-assignment port key value) (format port "~a = '~a'~%" key value)) ((? integer?) (format port "~a = ~a~%" key value)) - (#f - (format port "~a = true~%" key)) (#t + (format port "~a = true~%" key)) + (#f (format port "~a = false~%" key)))) (define* (write-assignments port alist) From patchwork Fri Sep 29 09:16:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54390 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 CBF6527BBEA; Fri, 29 Sep 2023 10:18:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F305327BBE2 for ; Fri, 29 Sep 2023 10:18:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dS-0005bp-0z; Fri, 29 Sep 2023 05:18:11 -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 1qm9dH-0005Uo-El 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 1qm9dB-0003uu-G2 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dP-0004n0-Kv; Fri, 29 Sep 2023 05:18:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 16/23] gnu: cross-gcc-search-paths: Handle AVR target. 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:07 +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.169597905818177 (code B ref 66263); Fri, 29 Sep 2023 09:18:07 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:38 +0000 Received: from localhost ([127.0.0.1]:55212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cs-0004iu-PJ for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:38 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:54310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cW-0004em-SQ for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:14 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-406589e5765so7859115e9.0 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979012; x=1696583812; 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=tO8jAljSfvVAL9I6FVZaB5JJJXvlhi2ireIV3u5HSB0=; b=Xj8DlnAKhYwOSa1qYO4ESm6nCWq7xATJODjV6NZx1JliFwO7VSNpxwh1QGQ/bhFuqv 5Xr5DQA/C0oSbCGkBYsI+KTHlOVeIuCwppmJYq7D3xWJCr/Qd5Jr4vi5UmZFp2dZUroh bTFUxi+hGV92mo13MkayOK2fMx+Vxxrfyu/6JVb6M9BFddb+8bgHLBBjiZ6P7sL2FW/v JhSBzqFuiP3TXCiJeY/wmv21CaGWXNba3FpStch6YOZIt+GngsK6tM6LjIjZVJ33z6xS 3E1YVfj+X/2LPE/dboP3LkWsq7Utx9XtqiPogqa7yGBHkuCXsnX5Dm8+gaonWdbQxxsg 5FlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979012; x=1696583812; 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=tO8jAljSfvVAL9I6FVZaB5JJJXvlhi2ireIV3u5HSB0=; b=TeeYzlL/ZQhOAf+lbqzXgcBKiEONIWaE/CtVFnVLqKnE7jCt9CtPUc4yTZB44nvjXE yY3zLx00QvwzwbgQOdbDcLVXEvO/al8QMIbTVxKQKR4MVOf5ZkAdGVGTwMQqZXq6c/lY YH9US/aC5Zja6tz0ZJ4uXzvzlH8Ixrzsz9HSz9jGzt3B114JA/qe6i5X6bH0AEqxBmzO x0jfMxfU03zNUJ9mhxvwgqXqF+BxuEPYVOeu9fXg/QVu78RotCqWauMXKIqD/S7Uuojd 4lNR6AfeYN2hNqt+5h9fW52addGdVlbNRKIfkUGlCrlPF8mYVe5pJajgAMctQingtPF4 Gung== X-Gm-Message-State: AOJu0Yx2pXx9xW4K4XIEPJxvbyVAIF9ZUu2cUhVmHsTpxo5V06SXWjLO b/ZbkkKpOT81O9fxolnaI3E8KxXJRriyRRI3BNLF4A== X-Google-Smtp-Source: AGHT+IHU2KKvmWc8lRin8EPqkhx9AkJLValHWs2MIHYHNKodnIbfLDBM/9n8jPC0tmG8n0jnWG4EpQ== X-Received: by 2002:a7b:ce09:0:b0:3fe:d630:f568 with SMTP id m9-20020a7bce09000000b003fed630f568mr3178323wmc.39.1695979012294; Fri, 29 Sep 2023 02:16:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:52 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:20 +0200 Message-Id: <20230929091627.7820-16-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-base.scm (cross-gcc-search-paths): Handle AVR target case. --- gnu/packages/cross-base.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 10d912b755..ee90424076 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -267,6 +267,31 @@ (define (cross-gcc-snippet target) "-DTOOLDIR_BASE_PREFIX=\\\"../../../../\\\"")) #t)) +(define (cross-gcc-search-paths target) + "Return GCC search paths needed for TARGET." + (cons (search-path-specification + (variable "CROSS_LIBRARY_PATH") + (files `("lib" "lib64" + ,@(list (string-append target "/lib") + (string-append target "/lib64"))))) + + (map (lambda (variable) + (search-path-specification + (variable variable) + + ;; Add 'include/c++' here so that 's + ;; "#include_next " finds GCC's + ;; , not libc's. + (files (match variable + ("CROSS_CPLUS_INCLUDE_PATH" + `("include/c++" "include" + ,@(list (string-append target "/include/c++") + (string-append target "/include")))) + (_ + `("include" + ,@(string-append target "/include"))))))) + %gcc-cross-include-paths))) + (define* (cross-gcc target #:key (xgcc %xgcc) From patchwork Fri Sep 29 09:16:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54404 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 4A3F627BBE2; Fri, 29 Sep 2023 10:19:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2930B27BBE9 for ; Fri, 29 Sep 2023 10:19:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9ds-0005y4-Gv; Fri, 29 Sep 2023 05:18:36 -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 1qm9dI-0005W8-PV 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 1qm9dC-0003vK-C9 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dQ-0004nB-2f; Fri, 29 Sep 2023 05:18:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 17/23] gnu: cross-gcc: Handle inputs for AVR. 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:08 +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.169597905918185 (code B ref 66263); Fri, 29 Sep 2023 09:18:08 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:39 +0000 Received: from localhost ([127.0.0.1]:55214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cw-0004j8-NP for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:39 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:45311) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cX-0004eq-W8 for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:15 -0400 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-99357737980so1826569766b.2 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:16:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979013; x=1696583813; 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=lOfnJsOxtIBdVIh262RnJHFnYanu9vJIpy6KAp9AD70=; b=KdR1lXps9ZcUFOOh5r073bgyMO8JfQaokTRV1VX22LiGihXlW+xOaM7oBK/iPArGIM XJGPbA2/WLLCIzSWmL7Vwyvvlek+RtR0Twl+2bJZkMgb5pkSmUqr4xkoH4Zd49MsMeyO FTGnjvNLTWfMc78x/2u3lxfFUlAXgZ1Hw1MsOw9FM+V+FprfHtvGE01PU1h/5Tj04nIM yXrccXV0ccz8Ef/DSdM7CAat+c8KchGF3LTuDonTi/dlquTscfHPrpwLtrAKTJOgdHZv WUL8pI5eGQE22Q4mqtyqswGizbqeP/cdZr7G+0+r0PTiDBiMKi3GmmWakhQLsxDaGZMC h0yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979013; x=1696583813; 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=lOfnJsOxtIBdVIh262RnJHFnYanu9vJIpy6KAp9AD70=; b=l2bA9jg1HkEsKOs4UNK2sIlQ7rXayj21p+sKWN5h5eFDp71VT2pZDWBBIfz+zTPtXg T1A8zlEQPhtrTu+PL1tridYHnEWiJLY3czDHJldTcSSDU/2BtCRSfRBnlSIzS5q4Cyph cXwl5tTqFelHeVf0GOcDB6DTV7ujpQzLAib08aNryCYtwZzCLLoL36wC7trZjSVB2qQl CSoKAdPe8Z5l7YZ38O92maodHp4EevESP/WD6hQq/5LrpgeI1P8X561iWGjMmvEsfmXU 4W2173oeD7f/+7gQ2UIvDnZeJh2DwPomnCF6zVQecgeaAiITj2QDlm+tFumkZSSEag4w XegA== X-Gm-Message-State: AOJu0Yxb8adzxqPymaGvUwegZ2X0Htso/qjKZMZbkVPg52Ub1eMMmDcE yhNsng1Drd3hfCFUnIVIsbsp4QjmW5MaUyWa5iGJtA== X-Google-Smtp-Source: AGHT+IGqqTLQbVkczuCpTd76MF+tdy+fTob5tOZe1fLB6W+g+iW2OjaNvE3z38huitvtHznlC4XvBQ== X-Received: by 2002:a17:907:8b8c:b0:9a1:b950:abab with SMTP id tb12-20020a1709078b8c00b009a1b950ababmr4383386ejc.32.1695979013392; Fri, 29 Sep 2023 02:16:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:53 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:21 +0200 Message-Id: <20230929091627.7820-17-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-base.scm (cross-gcc) : Handle inputs for AVR. --- gnu/packages/cross-base.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index ee90424076..ef793557fc 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -366,6 +366,11 @@ (define* (cross-gcc target ,@(assoc-ref (%final-inputs) "libc:static")))))) (cond + ((target-avr? target) + (if libc + `(,@inputs + ("libc" ,libc)) + inputs)) ((target-mingw? target) (if libc `(,@inputs From patchwork Fri Sep 29 09:16:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54400 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 146E727BBEA; Fri, 29 Sep 2023 10:19:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7641A27BBE9 for ; Fri, 29 Sep 2023 10:19:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dZ-0005ez-Vj; Fri, 29 Sep 2023 05:18:18 -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 1qm9dI-0005WV-R6 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:18:01 -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 1qm9dF-0003w2-Cy for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dT-0004oL-1B; Fri, 29 Sep 2023 05:18:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 18/23] gnu: Add avr-libc. 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:10 +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.169597907418256 (code B ref 66263); Fri, 29 Sep 2023 09:18:10 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:54 +0000 Received: from localhost ([127.0.0.1]:55228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9dC-0004kH-EN for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:54 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:60649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cZ-0004fD-Be for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:20 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-9ad8a822508so1859161866b.0 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979014; x=1696583814; 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=EmgX8jBDzrJn64eAP4jIE8M3qe0BewT3prMHk5BRrc4=; b=ed+G560gglP7ErljLDCDAn6J9X2Imsi8ZuvcBIU7bhC6u2h/TdbldV87ZCTYZrTKxF /CeRDqXJEfauzSwsDcxSDXv3hWxuMM4NfgeTOkLoNGDVO0IY1LT0m8TUNvxIgCXWiega JOYp4npVTSMcGOdrAiF2bmWX5DuEtEKKumvmJb3K91Ca7RgVLQSIkdOXWuXLZH0zIMBY IPp4TB7W2b/ji2sTHo0d8HMrekq2WWzmsIBUSGcT5kxDVa3TY5lpkJFXiK5LLN7KvuC2 2wvshVhPthED6CWWYdPd+u8tqB6rRqcsFpZgqJ+d0li1ZsvTHrECwVtwl0j6X8iAPyaU 0iIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979014; x=1696583814; 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=EmgX8jBDzrJn64eAP4jIE8M3qe0BewT3prMHk5BRrc4=; b=sgB3Ujit0V9knzUDVpxlhpPmj9TdARsNelbeEi3rjTH85KCBfi94K851MZ3nZmtfhh 7ZOZ9CArudXoWUKiTdliFxQYevXpZUoQ2Vta/tzsR/QOz/Iu7i8usomMdwcSPRqGKFFb ChtdC4cDriI7vdvVVBVsSz+zcQMK9BH+zsbz5b+wMKkA6GlKYYN7y1N5lCwIqKADHd6U fRdo3q7sGNeLDRn+wm6oVK7SdQkoc8fYbfysUJwRe72VNcmddyjDcP1tYFbT7jJmJKRU 9HQQ+2EaSBEbGH5DF2DYumnURuFGSAnQkLylkHIM0Z5/Z9P2h9l0CG0uScnuKc9rWB79 fT1Q== X-Gm-Message-State: AOJu0YytNFAnTeVAmF3uAYZHVtd4x7QPjK/MlfENW8vM1Uk3kXj0d+NZ qAvpLIjOVSkl34z3vvhGFTiKHDCGalZj+LL15dZD2g== X-Google-Smtp-Source: AGHT+IEv6w+y9JYnkHibtM6Ci/DrdLYP7p5C7acmwzhjwQvI4ymJ3nU4X+599uopQPrLufXOJlKV0w== X-Received: by 2002:a17:906:30d2:b0:9ae:63bd:a7fe with SMTP id b18-20020a17090630d200b009ae63bda7femr3385923ejb.10.1695979014346; Fri, 29 Sep 2023 02:16:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:54 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:22 +0200 Message-Id: <20230929091627.7820-18-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-toolchain.scm (avr-libc): New variable. --- gnu/packages/cross-toolchain.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/cross-toolchain.scm b/gnu/packages/cross-toolchain.scm index 77af6b862b..929e665e50 100644 --- a/gnu/packages/cross-toolchain.scm +++ b/gnu/packages/cross-toolchain.scm @@ -65,3 +65,8 @@ (define-public binutils-cross-avr (define-deprecated/public avr-binutils binutils-cross-avr (deprecated-package "avr-binutils" binutils-cross-avr)) + +;;; C standard libraries: + +(define-public avr-libc + (cross-libc "avr")) From patchwork Fri Sep 29 09:16:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54397 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 1D72027BBE9; Fri, 29 Sep 2023 10:18:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CCE5427BBE2 for ; Fri, 29 Sep 2023 10:18:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9de-0005iS-30; Fri, 29 Sep 2023 05:18:22 -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 1qm9dJ-0005WM-QR for guix-patches@gnu.org; Fri, 29 Sep 2023 05:18:02 -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 1qm9dC-0003vN-On for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dQ-0004nU-TV; Fri, 29 Sep 2023 05:18:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 19/23] gnu: Add gcc-cross-avr-toolchain. 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:08 +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.169597906318206 (code B ref 66263); Fri, 29 Sep 2023 09:18:08 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:43 +0000 Received: from localhost ([127.0.0.1]:55218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9d1-0004jT-1i for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:43 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:46477) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9ca-0004fZ-Cs for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:16 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4054496bde3so121296165e9.1 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979016; x=1696583816; 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=er1LrOuNNgwR8NIdmUfFlL8Q3iVsugp8u6EYIL7avIQ=; b=MNzwdg3gBjPjO/stqMvsGVjq1PmjH/cVmUHDDm3tLM/Zx/zijdP8f7xOICUlChzRwB 7/XMkL8ePB5v5k80C87MoKhMf+DjoJDPRUW/M5zWeDgN4MNR6Okvk9Aq8ss1oEBqpyqs lJ+dkw0uzH5HLsTnGJeR2Y7BtoaDzdFc4+7ARbMvvfhXDiPspN5csAUzr2f4JkuVnx0w V+16zIwsv3xCodyxlrP6VCkF1oiNOow6FH92EmuR+MhcbFP463g8f7O0R+IpWs+IMs1x uriSRposcXRzH4MOANYdedft8JC5OwPXZzvgkZp1OOhL2VcvybWCowkGPuPuSAgeHXob vAoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979016; x=1696583816; 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=er1LrOuNNgwR8NIdmUfFlL8Q3iVsugp8u6EYIL7avIQ=; b=Lks2SqlE8HpDuYpqSFd6vwWwpqhNi5o2PzEbIXMW4nMv2fpm9FY1klNPPqIJDvunxP nKYrx2LIT7VWGuUYc1zPMzAkk7C9P4fjEk5Ax5+6afb96ZQtjmP/Yis5AwwdgV+nmiuO YTVyCg5CqIq0ntkAMKgmK3yAWqXX0Bgk8Peo1jcp/8wC4cUG5+yVrT3hcZ3RWvnzU99C lA7OuNUZURgK+p4nCzj7ulDqroRJDdU+jYUpJO3VZKlUH16HkxhHTElPGUglgORNOsRJ giLb4zvdmgNkON0EOPBlsp6Or8WRoiCfA7+Wf1J+95wF9RV+B2DJcUhJTwb/S6175tX9 LGwA== X-Gm-Message-State: AOJu0Yz+NtEaQ8jXOGPRIJfEbQeZBt/R+NVWdndAhbq2bC+mCB72HXtF LLx3XVdWpVGdCKpPSoT6SweU3D6K12MU2QHgC/EG1Q== X-Google-Smtp-Source: AGHT+IE866XEar56wkbn1a18gAt5sE/fSqHpOeoDTHe/l7MPsRjNDWvy5GHYIK9uUuCbqK4nRDgvOA== X-Received: by 2002:a05:600c:2113:b0:405:1ba2:4fd1 with SMTP id u19-20020a05600c211300b004051ba24fd1mr3463312wml.24.1695979015901; Fri, 29 Sep 2023 02:16:55 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:55 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:23 +0200 Message-Id: <20230929091627.7820-19-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-toolchain.scm (gcc-cross-avr-toolchain): New variable. --- gnu/packages/cross-toolchain.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/cross-toolchain.scm b/gnu/packages/cross-toolchain.scm index 929e665e50..2ee039c7f6 100644 --- a/gnu/packages/cross-toolchain.scm +++ b/gnu/packages/cross-toolchain.scm @@ -70,3 +70,11 @@ (define-deprecated/public avr-binutils binutils-cross-avr (define-public avr-libc (cross-libc "avr")) + +;;; Cross toolchains: + +(define-public gcc-cross-avr-toolchain + (make-cross-gcc-toolchain "avr" + #:libc avr-libc + #:xgcc (cross-gcc "avr" #:libc avr-libc) + #:xbinutils binutils-cross-avr)) From patchwork Fri Sep 29 09:16:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54392 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 275A927BBEB; Fri, 29 Sep 2023 10:18:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AC4E627BBE2 for ; Fri, 29 Sep 2023 10:18:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dg-0005m5-9Y; Fri, 29 Sep 2023 05:18:24 -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 1qm9dJ-0005Wv-Qh for guix-patches@gnu.org; Fri, 29 Sep 2023 05:18:02 -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 1qm9dE-0003vs-9S for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dR-0004nn-Mx; Fri, 29 Sep 2023 05:18:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 20/23] gnu: Add avr-toolchain. 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:09 +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.169597906718225 (code B ref 66263); Fri, 29 Sep 2023 09:18:09 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:47 +0000 Received: from localhost ([127.0.0.1]:55222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9d5-0004jn-AS for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:47 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:49537) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cb-0004fn-MA for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:18 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-406609df1a6so1484285e9.3 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:17:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979017; x=1696583817; 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=npbdwcZGT+fYKTFtUHXwLobBmamqjAtraPBNHIsuWKM=; b=UPpySZDX845v1SRDlEujdS3MmeZqNys9QYMdabIMr+HQU5WPDuHotybjdh7pqom5uN 12QcHqBglvHF2JalWAZAcnFsRHlfMhk7LuIFt3rN9/PwFL/1vWlx6BgQAOpbs8JSjID7 om3uPZpwRx2zSAqZIndY3MfD9mIunyHi8O9CKOAeQhYYSdtKKRb3okADwVF6mPSz9ZhD 48zC/7LN0ysll94l/ayCzYaX7ZfrmN2KPteOV3EIzjv78e3qJQcCImZT200HwqEtWgnK HVRXIhwVJI8Vk48VDIEyMTIokVI3mzT2uwn7BI+VFFqE6Kc5cE35dW0rkymoAm3WscXC /Uwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979017; x=1696583817; 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=npbdwcZGT+fYKTFtUHXwLobBmamqjAtraPBNHIsuWKM=; b=eDpUSWVQH44gPqHFrAIAnnGXufJiCWYpcKwGL+LoozxJngfywqDp7Owd8QzTGZqKj7 6e6MFtUgLKEd1fAaEwUYEeSZH9nb3XE7Y7Za46XykfbJBEF5hRz1LYCaUb9yDDnIZEKJ pmMIMH0pW0QpuyBMQx9QsU8089ZaFTLKm65SE0uHASlOxHzR7LEb8nmKQLbDwIuLGq+3 AXzIaLTliDjfuWe1EApI1Mq3fkbe3xhkUPLmRn23xIstdaJ44ytDBT2Kf0HMPrFyAyGQ AFgfgLn4DluCWqab+iz99DJ6Q6iG7YrWHMqGtno37UtvRq6MlyosWjqtkUiiqBstp+4v L4dQ== X-Gm-Message-State: AOJu0Ywl8JO6yG/owidWH4sx98lHB6IH0If1FOUuXMpo6q9LC9m7I0bJ AbB85DnzDAz3tp9g6s0mxuVofpHys+Swtv6yt35v0g== X-Google-Smtp-Source: AGHT+IGT1LnQGMpEuUcpvHlc3OC6VAqaerjtBtBoYxDRbr8LDtF7tTHNFRcjaRt5hAaHjZRbbc+dUw== X-Received: by 2002:a05:600c:1c11:b0:406:5359:769f with SMTP id j17-20020a05600c1c1100b004065359769fmr3177054wms.0.1695979017093; Fri, 29 Sep 2023 02:16:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:56 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:24 +0200 Message-Id: <20230929091627.7820-20-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-toolchain.scm (avr-toolchain): New variable. --- gnu/packages/cross-toolchain.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/cross-toolchain.scm b/gnu/packages/cross-toolchain.scm index 2ee039c7f6..0f1cd45b40 100644 --- a/gnu/packages/cross-toolchain.scm +++ b/gnu/packages/cross-toolchain.scm @@ -19,6 +19,7 @@ (define-module (gnu packages cross-toolchain) #:use-module (gnu packages avr) #:use-module (gnu packages cross-base) + #:use-module (gnu packages flashing-tools) #:use-module (guix build-system trivial) #:use-module (guix deprecation) #:use-module (guix packages) @@ -78,3 +79,10 @@ (define-public gcc-cross-avr-toolchain #:libc avr-libc #:xgcc (cross-gcc "avr" #:libc avr-libc) #:xbinutils binutils-cross-avr)) + +(define-deprecated/public avr-toolchain gcc-cross-avr-toolchain + (deprecated-package "avr-toolchain" + (package/inherit gcc-cross-avr-toolchain + (inputs + (modify-inputs (package-inputs gcc-cross-avr-toolchain) + (append avrdude)))))) From patchwork Fri Sep 29 09:16:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54388 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 D48D627BBEA; Fri, 29 Sep 2023 10:18:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5BFD127BBE2 for ; Fri, 29 Sep 2023 10:18:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dV-0005cW-MG; Fri, 29 Sep 2023 05:18:13 -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 1qm9dI-0005W6-O7 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 1qm9dE-0003vu-I2 for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dS-0004nz-52; Fri, 29 Sep 2023 05:18:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 21/23] guix: meson-build-system: Support AVR. 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:10 +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.169597906818233 (code B ref 66263); Fri, 29 Sep 2023 09:18:10 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:48 +0000 Received: from localhost ([127.0.0.1]:55224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9d5-0004ju-KD for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:47 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:42067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cd-0004g9-7n for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:19 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4060b623e64so2580225e9.0 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979018; x=1696583818; 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=MKc/WweQ4MCivzohc2pnxfFdjaAeZvN4Mwc71xGnllk=; b=KXVBF6/GK8wFlT+eJXVaXaLdoIf1apoSY96dTl7xl1Xrs87l9DYUCyKlXqovdETaOv MAsxgwRQovUb0iIrd3DavDm/ZPr7evVLQ5hY+fZMHvxmpWuntBb8QPJEuAFDluWwwV8c CA99bK/kzN4aelNc6hS5WmBl1/kFIpSE7AXYFoNG/G/AksYq0dqTjHRdUD8XwJ7wHuPT g/W7uhQj+mgPKnS1EuHuPFyFMWFc7l0IeTkf921JyxGPwLadjCddV5xAUdUpcHSS0qik oDjyE+QWTLYnqx/tLoGVLSRRP3ipHXHaUjYiM+NOcD0mdzzilblStf0wYLX66XmEMzzc xhPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979018; x=1696583818; 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=MKc/WweQ4MCivzohc2pnxfFdjaAeZvN4Mwc71xGnllk=; b=KGnxsXPNujMujB4qI50aFCEHOwUcxKj944Il72iGlZi/mB5KNRneUsZyCy4W7h1hHV qJpLVi0Hygv848Uu36OLDdfE5VbDUmPl0w8DMo0WbNoWVXmE0/kheSdkG6XxUmuhrJGq bmRnqDj26VuDGEqVyVWrHnwCCCx0KWLpRURnaKGkk2ISGx+rptf6acRqDwrhmVjpYKQ1 s1I/WsFGRKC00Q7/Nk+Aic5kG5eWYWDOZTu804Mn4n8QRyGc3zWt3b1KeiTWLEbqtqEy YaOcHbvBIxl4/QRDziifp/gbYMqpUJ2jvgtiNiLYLlZJBHc/dAqVSr+Myg1fseGgKgNL 3HNA== X-Gm-Message-State: AOJu0Yx/DRbsAU7lgdM6eupJ5Vf0+pDMy7bMuIZaVP00kA4OOvhyzdJw 8758lc9TTqhnpMv45hTSUePVxFkk6B+ivuRh8tPHaw== X-Google-Smtp-Source: AGHT+IFQS2lCO259Iq/8inJguLOOmsvJy4HAkrQOo9sqRH/i2EkB3AHswDS4jFsVJZ9oP7eScnBb1Q== X-Received: by 2002:a05:600c:3b2a:b0:406:45c1:4dd with SMTP id m42-20020a05600c3b2a00b0040645c104ddmr3399990wms.14.1695979018204; Fri, 29 Sep 2023 02:16:58 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:57 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:25 +0200 Message-Id: <20230929091627.7820-21-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build-system/meson.scm (make-machine-alist) [target-avr?]: Set to none. [target-avr?]: Set to avr. [target-avr?]: Set to avr. --- guix/build-system/meson.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 7c617bffb0..b894789fb8 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -49,11 +49,13 @@ (define (make-machine-alist triplet) `((system . ,(cond ((target-hurd? triplet) "gnu") ((target-linux? triplet) "linux") ((target-mingw? triplet) "windows") + ((target-avr? triplet) "none") (#t (error "meson: unknown operating system")))) (cpu_family . ,(cond ((target-x86-32? triplet) "x86") ((target-x86-64? triplet) "x86_64") ((target-arm32? triplet) "arm") ((target-aarch64? triplet) "aarch64") + ((target-avr? triplet) "avr") ((target-mips64el? triplet) "mips64") ((target-powerpc? triplet) (if (target-64bit? triplet) @@ -66,6 +68,7 @@ (define (make-machine-alist triplet) ((target-x86-64? triplet) "x86_64") ((target-aarch64? triplet) "armv8-a") ((target-arm32? triplet) "armv7") + ((target-avr? triplet) "avr") ;; According to #mesonbuild on OFTC, there does not appear ;; to be an official-ish list of CPU types recognised by ;; Meson, the "cpu" field is not used by Meson itself and From patchwork Fri Sep 29 09:16:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54403 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 9B1BE27BBEA; Fri, 29 Sep 2023 10:19:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 411D127BBE2 for ; Fri, 29 Sep 2023 10:19:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dr-0005wn-SZ; Fri, 29 Sep 2023 05:18:36 -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 1qm9dI-0005W5-Ny 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 1qm9dF-0003w3-EW for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dS-0004oC-JN; Fri, 29 Sep 2023 05:18:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 22/23] guix: meson-build-system: Disable PIC for AVR. 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:10 +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.169597907418248 (code B ref 66263); Fri, 29 Sep 2023 09:18:10 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:54 +0000 Received: from localhost ([127.0.0.1]:55226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9d5-0004k2-VO for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:54 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:57841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9cd-0004gT-QO for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:20 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40535597f01so140505595e9.3 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979019; x=1696583819; 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=FyAGWA1iVJ69KfccThZICbnx6k2dV4sBFRV49qBPGoc=; b=itNQh3bRfNooor5HZq6yPw1ha9V2uiXNB+8bQ+rH4aDPbb+x94dORHHphvIJxW2EEd vj22g18jiyKbZyjfywmfyzO997f3VqUn9hQ/9v/RAMEdZ5S8CoIJEEX5BL2f0XT10gPJ 9xLJdFHhQJltAElRNpLkGuXZ1/8PWaIUsXaDAaiuG3Z89KZdn5Q8tYoNqt810MKEx+VW 7SMt1IF+mwyn/uYTWWiLRBGpxv+LqrpQdOHxqNOyXpjWPfDITbVRYurM55z4uip98N65 FlG+e1+VKWZqwePZsB3+hu7f9O+15oGL9P0WZt4AT4xbSWzA3BcykAGkk0DP1i9eacYp ckJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979019; x=1696583819; 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=FyAGWA1iVJ69KfccThZICbnx6k2dV4sBFRV49qBPGoc=; b=MQoIZ61upweA4X3jt77Kizb/S3Fu5ZX1EeoCjRiZBlzqv3RVBhw7v7Wn/fpO7qPyUA 7TjuaXekr4xqhzNd/NOOX0/RFOcIKorNqP1DRBbkGAgCWqLbH7quhpq1zkm7DllIS0Fe /++kOH+6KCBv772rkUVzLUjkLdglGutGVw7Bv1WruA6s3BBUZA/pREo9PeNKcxEPPUat uJryRbuP5tITPKzTHI9oWN0PrYC57j6mHzs1bh9PH85Z7woEa7D5Vd424rMClAMvOvmV vjnOZt4KC/dHPz1eTbEc8782tJgDJKQIykj746/OGDBJA3+2kcnMXIK+7MGImkvwfHir gh6Q== X-Gm-Message-State: AOJu0YxwkEUzG6gPc3uqwNKCDoBqHSWYG/mUAoX2EzMLJ/nFmS9qRebe a9knmbc1SIqYxrixKXrYvCHvOHKRkUB1JVRq3G25lw== X-Google-Smtp-Source: AGHT+IHhh5SyTrtxTuqQNqbiPWVfSRnYiQaTz3PulgsYT6zyCOigpqEVg+wAJL7bXlMUpDMLx82hMw== X-Received: by 2002:a05:600c:4750:b0:406:54e4:359c with SMTP id w16-20020a05600c475000b0040654e4359cmr3184269wmo.19.1695979019213; Fri, 29 Sep 2023 02:16:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:58 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:26 +0200 Message-Id: <20230929091627.7820-22-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build-system/meson.scm (make-built-in-options-alist): New variable. * guix/build-system/meson.scm (make-cross-file): Add 'built-in options' section to cross file. --- guix/build-system/meson.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index b894789fb8..92e47285d6 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -92,6 +92,13 @@ (define (make-binaries-alist triplet) (ld . ,(string-append triplet "-ld")) (strip . ,(string-append triplet "-strip")))) +(define (make-built-in-options-alist triplet) + (if (target-avr? triplet) + `((b_pie . #f) + (b_staticpic . #f) + (default_library . "static")) + '())) + (define (make-cross-file triplet) (computed-file "cross-file" (with-imported-modules '((guix build meson-configuration)) @@ -102,7 +109,9 @@ (define (make-cross-file triplet) (write-section-header port "host_machine") (write-assignments port '#$(make-machine-alist triplet)) (write-section-header port "binaries") - (write-assignments port '#$(make-binaries-alist triplet)))))))) + (write-assignments port '#$(make-binaries-alist triplet)) + (write-section-header port "built-in options") + (write-assignments port '#$(make-built-in-options-alist triplet)))))))) (define %meson-build-system-modules ;; Build-side modules imported by default. From patchwork Fri Sep 29 09:16:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54398 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 82E5C27BBE9; Fri, 29 Sep 2023 10:19:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7B23027BBE2 for ; Fri, 29 Sep 2023 10:18:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9dZ-0005eR-V1; Fri, 29 Sep 2023 05:18:17 -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 1qm9dI-0005WA-PP 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 1qm9dE-0003vz-Se for guix-patches@gnu.org; Fri, 29 Sep 2023 05:17:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qm9dT-0004oV-Gw; Fri, 29 Sep 2023 05:18:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66263] [PATCH 23/23] gnu: Add unity. 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:11 +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.169597907518263 (code B ref 66263); Fri, 29 Sep 2023 09:18:11 +0000 Received: (at 66263) by debbugs.gnu.org; 29 Sep 2023 09:17:55 +0000 Received: from localhost ([127.0.0.1]:55230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9dC-0004kQ-Pc for submit@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:55 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:44454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qm9ce-0004gh-Qn for 66263@debbugs.gnu.org; Fri, 29 Sep 2023 05:17:21 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40651a72807so16441305e9.1 for <66263@debbugs.gnu.org>; Fri, 29 Sep 2023 02:17:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695979020; x=1696583820; 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=wETUNZ0awq4HLb2Qaa8XGTbwJL1VkKwq6Gkgfpv58qY=; b=gQeWprce7Q7IvgokD61y/5UWfC6+cy7nIgYrxplCllP7QaTOlBv1gsezpUdP4C/NTg sclEeJpaQwcRCpjcLp/VVllHQjOLzPJoIU3Dp6rESqTG4vp+WebynIZ1UOebkEn1dYtj 7V8l+lpwv+8RBKdnXp9hVGDpF2UGfcOZrqHajfdJs5kQLl910KVck9uUz+xjokgA9QB2 t5sB6iWixP2842p0XUZYBclKS/WFTc5ZPX3YQ8iZ6SZQ3mDxgcGba0XgVrHH0GoOJeHC euR8S3A9dwjT8JEvHgy3ovIIzQE/zIDpfc0CKRnhEC3x0DymTSWBnIX4yhQ5c3y9IQVh xaFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695979020; x=1696583820; 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=wETUNZ0awq4HLb2Qaa8XGTbwJL1VkKwq6Gkgfpv58qY=; b=rZ37Lno9reAq62Q2GDmMLcPfx6n78yjcb1+jgzxV0aGel8ucBuyB6ApBbRLrRwrAiY jc3rnov/2VCijxHW7C8VuyAG1GKJTNOUUppoKgCAt6LYgNUKgYtTxZXnhYZ0eU29sV/r hLrjjlsZc8VAOfY+ya0cSdSSMvm3vGRPV/L+Jk97A9ogF8acB7mc4b1JlPVPUrrPYmvd FCFwROB6RDairZ7kPB/JW0OUN1yMzatWgFtdukCrUhE5nvjaXOHbVur0SiK1iLDe0RC8 W/FL8H0fnLLl6Jlw8MFUR89V/UcMfxIa62VgcAri9Qq69rc5kSKy63LQuDRsrZexPxFs 6n4w== X-Gm-Message-State: AOJu0Yy9GO/CyGkcdETM6Sz0FIRNK7RDKPHdaCdDuMAAdL3LqcYpt01n gvbsPu2qfaozXBhQcXNoMrYnJsq4K+gA2jdhQLl6yw== X-Google-Smtp-Source: AGHT+IF2oZYBDOyATpEIZOCi88wzZJ4boy0BrIuaivKRNvp973vW4SB+CV8FwQTz06s5NP25A4rgOw== X-Received: by 2002:a1c:f709:0:b0:403:272:4414 with SMTP id v9-20020a1cf709000000b0040302724414mr3424673wmh.0.1695979020247; Fri, 29 Sep 2023 02:17:00 -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.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Sep 2023 02:16:59 -0700 (PDT) Date: Fri, 29 Sep 2023 11:16:27 +0200 Message-Id: <20230929091627.7820-23-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 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 X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/check.scm (unity): New variable. --- gnu/packages/check.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5af3b49280..db368663d4 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -87,6 +87,7 @@ (define-module (gnu packages check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages ruby) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages xml) @@ -3170,6 +3171,46 @@ (define-public unittest-cpp portable to just about any platform.") (license license:expat))) +(define-public unity + (let ((revision "0") + (commit "2775e1b05875cf45afce7153e36af76ddbfdba26")) + (package + (name "unity") + (version (git-version "2.5.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ThrowTheSwitch/Unity") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y803ibjkqvj1fil0a0hzs7x0m98amm5ibwl8xxk3p8bj9wgdps1")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags #~(list "-Dextension_fixture=true" + "-Dextension_memory=true" + "-Dsupport_double=true") + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "../source/test" + (invoke "rake" "all")))))))) + (native-inputs + (append (list python) + (if (not (%current-target-system)) + (list ruby + ruby-rake + ruby-rspec + ruby-rubocop) + '()))) + (home-page "http://throwtheswitch.org") + (synopsis "Unit testing framework for C") + (description "Unity is a lightweight unit testing framework for C. It was +designed to allow running tests on embedded devices and on a host computer.") + (license license:expat)))) + (define-public libfaketime (package (name "libfaketime")