From patchwork Fri Jun 2 05:18:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50530 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 2B3C227BBE9; Fri, 2 Jun 2023 06:19:56 +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 01EDE27BBE2 for ; Fri, 2 Jun 2023 06:19:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4xBw-0007sh-3v; Fri, 02 Jun 2023 01:19:12 -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 1q4xBq-0007rH-DK for guix-patches@gnu.org; Fri, 02 Jun 2023 01:19:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4xBn-0000L1-RP for guix-patches@gnu.org; Fri, 02 Jun 2023 01:19:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q4xBn-00055B-NS for guix-patches@gnu.org; Fri, 02 Jun 2023 01:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH v2 5/8] gnu: Add libc-for-target and glibc/hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jun 2023 05:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: Josselin Poiret Cc: 63641@debbugs.gnu.org Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.168568311719479 (code B ref 63641); Fri, 02 Jun 2023 05:19:03 +0000 Received: (at 63641) by debbugs.gnu.org; 2 Jun 2023 05:18:37 +0000 Received: from localhost ([127.0.0.1]:38813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4xBJ-000541-3I for submit@debbugs.gnu.org; Fri, 02 Jun 2023 01:18:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q4xBG-00053l-6Q for 63641@debbugs.gnu.org; Fri, 02 Jun 2023 01:18:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4xB9-0000EM-TP; Fri, 02 Jun 2023 01:18:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=lcu2aX4rsqMy3AhNHyX5UzYTDZ59AlyO41pU3TJblXg=; b=lKdTaRDMJ5BO4iVb+4e9 3tvqFEf4DKJUlTzYwRykomQ80p3/SseYzrHjkgUyKbb/MyN270qXASGEDIfQtilH9gDffAgdYxCEU Ad9NJ9JxO89kHucwVBtAMm46dpsom72YGrR7ieMUb8k9T/V7QqeQ9rOPco5AWhBgReYCmwepKaPJz DDTIYiZq/BAKCmxdVCYWIHO4FiawG3n43RwMKsUa1O9gNPRjx2+4n6VWVUKcfKbTQ5+mqMtQg6AYs yoq2Ps1FSmR8BtipMkxjZIsatsTvikVovPq5CFByNXAU1PBFZqUxg12YxqseHhKSpZZNfvJB+2wrn +GDJ7jZR4lXNyw==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4xB9-0003yI-2e; Fri, 02 Jun 2023 01:18:23 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87jzx07lmr.fsf@jpoiret.xyz> <37e9697f42aecfb83757989f8172beba8faf32ab.1684748476.git.dev@jpoiret.xyz> X-Url: http://AvatarAcademy.nl Date: Fri, 02 Jun 2023 07:18:18 +0200 In-Reply-To: <37e9697f42aecfb83757989f8172beba8faf32ab.1684748476.git.dev@jpoiret.xyz> (Josselin Poiret via Guix-patches via's message of "Mon, 22 May 2023 11:42:26 +0200") Message-ID: <87y1l2moh1.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Josselin Poiret via Guix-patches via writes: Hello again! > From: Josselin Poiret > [..] > * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash, > glibc-final): Use libc-for-target. As discussed on IRC, I found that we're still building glibc-2.35 during commencement. I overlooked that this recent patch of yours made these changes in commencement, so I already made patches for this (attached). So, apart from my earlier comments [..] > diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm > index ab07fb37ab..a24c60ebf8 100644 > --- a/gnu/packages/commencement.scm > +++ b/gnu/packages/commencement.scm > @@ -2816,13 +2816,13 @@ (define (%boot1-inputs) > ("binutils-cross" ,binutils-boot0) > ,@(alist-delete "binutils" (%boot0-inputs)))) > > -(define glibc-final-with-bootstrap-bash > +(define/system-dependent glibc-final-with-bootstrap-bash > ;; The final libc, "cross-built". If everything went well, the resulting > ;; store path has no dependencies. Actually, the really-final libc is > ;; built just below; the only difference is that this one uses the > ;; bootstrap Bash. > (package > - (inherit glibc) > + (inherit (libc-for-target)) > (name "glibc-intermediate") > (outputs (delete "debug" (package-outputs glibc))) We probably want this to be (libc-for-target), even though they're bound to be similar, and more importantly, > (source (bootstrap-origin (package-source glibc))) I believe this needs to be (libc-for-target) to actually use glibc-2.37. [..] > + (let ((libc (libc-for-target))) > + (package/inherit libc > + (name "glibc") > + (source (bootstrap-origin (package-source glibc))) Likewise, I think we need to use "libc" here. Greetings, Janneke From 380aaa334c89af68f1183e5120dc238b18f0cd6e Mon Sep 17 00:00:00 2001 Message-Id: <380aaa334c89af68f1183e5120dc238b18f0cd6e.1685682827.git.janneke@gnu.org> In-Reply-To: References: From: Janneke Nieuwenhuizen Date: Thu, 1 Jun 2023 23:40:49 +0200 Subject: [PATCH 2/2] gnu: commencement: glibc-final: Use libc-for-target for source too. * gnu/packages/commencement.scm (glibc-final)[source]: Use libc (libc-for-target), instead of glibc. --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7df5c9b5c9..2477114ed7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3072,7 +3072,7 @@ (define/system-dependent glibc-final (let ((libc (libc-for-target))) (package/inherit libc (name "glibc") - (source (bootstrap-origin (package-source glibc))) + (source (bootstrap-origin (package-source libc))) (inputs `(("static-bash" ,static-bash-for-glibc) ,@(alist-delete "static-bash" -- 2.40.1