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