From patchwork Mon Nov 18 08:45:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70497 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 27A1927BBEA; Mon, 18 Nov 2024 08:47:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 702BF27BBE9 for ; Mon, 18 Nov 2024 08:47:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCxQ5-00062G-96; Mon, 18 Nov 2024 03:47:43 -0500 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 1tCxPS-0005p2-BA for guix-patches@gnu.org; Mon, 18 Nov 2024 03:47:04 -0500 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 1tCxPS-0005RP-0z for guix-patches@gnu.org; Mon, 18 Nov 2024 03:47:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=nEN99mCtmQyK1z3x2EgudRnXW7hnDpPlTg7SnWeLEtA=; b=Gt2bp1+OYe4N6RiWiClh92ROSgXz6g4K/rDB7qqbcAENBYmztWIChyM++ozRO+OAMwvIwVceF1xXXgZ02I8HCkJMhxdn7QzhJ3yzE5//2F4MusKR9UeFfnikSP2jSLSVgS07RcrLgfmqdxl7D4xuwXGlCUs8IqYeVDJXrKemROkHUmwNHXSjSHKX550Bu+IWG8g19IIOjh0tsAPYYlyCXgub8V87nrvTVomb/Mw+MgFdlLvSJeE4IZhVHrRln+czneeUOXQfGBtbNCM1Bj5YWMbWDNSTZNHUWzbusWcqQB3TZQ0KE1N1hOHXdo022TQYGcy5/1Dl1MvUDvjhytb9jQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tCxPR-0005kk-SE for guix-patches@gnu.org; Mon, 18 Nov 2024 03:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 05/40] gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Nov 2024 08:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org, Josselin Poiret , Ekaitz Zarraga , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173191959422075 (code B ref 74290); Mon, 18 Nov 2024 08:47:01 +0000 Received: (at 74290) by debbugs.gnu.org; 18 Nov 2024 08:46:34 +0000 Received: from localhost ([127.0.0.1]:59871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCxP0-0005jy-64 for submit@debbugs.gnu.org; Mon, 18 Nov 2024 03:46:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCxOy-0005jg-Ge for 74290@debbugs.gnu.org; Mon, 18 Nov 2024 03:46:33 -0500 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 1tCxOr-0005N6-Ua; Mon, 18 Nov 2024 03:46:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=nEN99mCtmQyK1z3x2EgudRnXW7hnDpPlTg7SnWeLEtA=; b=pjlqyg2XP2FTI2A3ve6u nyXSqZsopm6j86aFHFGThfkVvgfvXHPsgttBYcL6MAhvLmHk+kBlBBVJT8WOmIpKOA9JfIZvYQ/n3 dahQ/VDxPVsaWJD8oQH0RZOqU8rKfyt3f+qTG83Yi5xcp5URCA2aMAQ82eWV384G9/WSvebOMAIGi 0qoFzfSgglYI58lRELF+0TgnrUYVtwJD8GC9YuXVHK/Udi5DYlyfAn1+04Ni3nYsqRID1tVfGa2GO eQJ02dYsAy4DifI5I4Wa8jL85I5+uOdhc26S8Llh+J1UBx4tU17Mj/IeJLPG5hXPXu5DsisVJD7CR bk9ljaOqPu7MhQ==; From: In-Reply-To: <87o72dn544.fsf@gnu.org> (janneke@gnu.org's message of "Sun, 17 Nov 2024 18:26:51 +0100") Organization: AvatarAcademy.nl References: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> <87mshxkd89.fsf@gnu.org> <87o72dn544.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Mon, 18 Nov 2024 09:45:59 +0100 Message-ID: <87bjydhquw.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) 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 > Ludovic Courtès writes: > >> Janneke Nieuwenhuizen skribis: >> >> Then, as a second step, we could prepare a ‘core-packages-team’ branch >> that upgrades ‘gcc’ globally, and that way we keep something consistent >> and simpler, without ‘current-gcc’. (Though it means we’d have to wait >> before we can build natively on x86_64-gnu.) >> >> WDYT? > > I've been thinking about this route and decided against it because it > seems to me that upgrading to gcc-14 will cause a lot of trouble/work. > > However, if that work is shared, and we have the build farm to help, it > may be the best route. Maybe the wait doesn't have to be too long? > Also, in the mean time, upstream support might improve. > > Maybe we can decide to go the route you propose and also keep this > current-gcc patch on the hurd-team branch for a bit (we prepend a fat > REMOVEME in front of it). We can keep working on native Hurd builds > that use gcc-14 on hurd-team using this hack, until core-packages-team > is ready to make it obsolete? So, what about if we do, in addition to the %xgcc => gcc-14 in cross-base -- we use gcc-14 on the 64bit hurd /system/: --8<---------------cut here---------------start------------->8--- --8<---------------cut here---------------end--------------->8--- Wouldn't that just work? We can do that in parallel with the gcc-14 update in core-packages-team. Greetings, Janneke diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a14de3002f..2b0b4b07b4 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3642,7 +3642,9 @@ (define-public gcc-toolchain-14 ;; The default GCC (define-public gcc-toolchain - gcc-toolchain-11) + (if (system-hurd64?) + gcc-toolchain-14 + gcc-toolchain-11)) (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 64ba37fd69..d90502f403 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -857,7 +857,10 @@ (define-public gcc-14 ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions. -(define-public gcc gcc-11) +(define-public gcc + (if (system-hurd64?) + gcc-14 + gcc-11)) ;;;