From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2CX1JVffQme7DAAAqHPOHw:P1 (envelope-from ) for ; Sun, 24 Nov 2024 08:09:59 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 2CX1JVffQme7DAAAqHPOHw (envelope-from ) for ; Sun, 24 Nov 2024 09:09:59 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=SDv2FACr; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=YdwBJ96U; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732435799; a=rsa-sha256; cv=none; b=c7ndS6HeWZL28MMuAUNiYiixEfX+ESuKQn/Bw/trvANUvNGCdS+2bkbzk2aL/7Lk+eOZsj s3lMu9XY8ymMvujLPPvl7sGYCdTBBC14MFN0NudRriiwV3pWY4hc4REVRD7lrGFHp4bA9O jx6J+csEzWHBWAB3pgtyoj2rQNhoQqJ+3/7pvIcgVt9ImYKhdQFxX1vuqXIR5/0S0LH38M lWwxsQOxkfqSvDq+wN1KJF7BqgH6V7NtL5LHwIhYd/cbBOpf37c0JnV74a/qHU6zletJGK n8fKq8yW/DQreidHqe9RXf0v8OKnsQxep8vPyG4YE04hkqsieeOv/7/yTQdhew== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=SDv2FACr; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=YdwBJ96U; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732435799; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=kV0M/ADy40rGl6NL9D3sc2tQ2O6/8QaTAL6H8zLPIghNffb+s5ypvJEfNpwm7eGUR2kI2X zZ7JW3NGcAwCa8gNd+QNFc4z/q2RwDvLQ5+x1WUK4QwjS5cdZdjUij9tx7Wpfg9WYqOy7o bvN3WI4Waogy2WQpuGLb9cZzZfRgJR+BVJWGy6XbRO3H3NGjC0CCEZD2WaLglwlTxSMLtF 3iaxzqUT+o46WSYqW22L3Mg7Df2KipB9ETh8aZ6pbwvt7T85GHCHhmT3sepPAhhyuSvqkW W+iRdr52QrHYlksAT6jry5F0zt4ip6Orklojg03B3utO/PttitanXMaekQ5Q9Q== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3DC088C48F for ; Sun, 24 Nov 2024 09:09:59 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7VI-0000kF-9I; Sun, 24 Nov 2024 02:58:00 -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 1tF7Uo-0000SI-Vg for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -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 1tF7Uo-0002QE-Hi; Sun, 24 Nov 2024 02:57:30 -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:References:In-Reply-To:Date:From:To:Subject; bh=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=SDv2FACryfbh+V1AVIKkw+lC34sLLFWrjhF+zGTG5YBNcQHdWUCQq6AYsxxM3yI2Elqh3eDhTc8exIhhpRpot+Q4ZswAp9xgFrVW8Ja2PIS4ZCiNwKxN2XpTRI+7Cd9Xo9Unt4xJj8x0/+aoweW8cQd4z5aVObGEqbIy0/68YgedjAY8QG/nxB0PC40HTyBkA9N9SnR7V+x4QXsc6MKXgiSk9+GAXQj4aUpjiJAxHRZTaHk323M2PNaFZxUrw4imlKQI3Zw9A01epih/gDkNXOPNC1VAJIzgtI4odUiwMPu71LrPlYbhVWu4y6RUzTqwWmf6MAEmu9H3hqO694tcvw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uo-0004ni-Bn; Sun, 24 Nov 2024 02:57:30 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 46/58] gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:30 +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: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503918259 (code B ref 74290); Sun, 24 Nov 2024 07:57:30 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:19 +0000 Received: from localhost ([127.0.0.1]:60872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ud-0004kD-0j for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U8-0004bX-FA for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:48 -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 1tF7U3-0002Hf-1p; Sun, 24 Nov 2024 02:56:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=YdwBJ96Ulj5MS/REdVVE 7+YPn8Kdv7ejLEsZNNYcwoUroVX97o5V4M00SshhnLAFFHs5lW629qmBdlNBoPomquDPZuGGbiFeV qWa1/6G+41BUh86MxqSIUKNgffqe6C+jCGXICiHk90h4ubljVwcF/RnImDr3Wg+01mAuOI6EvjV4N Yw0Qncra78FwpaQ6g/ektrSrN2/dwudyjuBdDP2eYDzWwdQNpaLRuLe5qTg3Dry5UByeLfou91rcr NKFjczqBGNDt6ILFsxtMiup31RwKhB4P9vGhFRCMgaPPuldMd6HFD59BIc8UtoQrDurCnQ8BtYLVB fYvYZoj8M1WLMA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:09 +0100 Message-ID: <0f6acb8bd7ab8198cea709492c792c16c2d4f895.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.98 X-Spam-Score: -3.98 X-Migadu-Queue-Id: 3DC088C48F X-Migadu-Scanner: mx10.migadu.com X-TUID: fCyn1fTyeV+f * gnu/packages/commencement.scm (libstdc++-boot0-gcc7): Change variable to... (make-libstdc++-boot0): ...this new procedure and update accordingly. (gcc-boot0): Update accordingly, and cater for x86_64-gnu. Change-Id: Ib0bc84e4dab90b080e5a01e6ab932f8be456c656 --- gnu/packages/commencement.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ad70bae501..a14de3002f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2273,9 +2273,9 @@ (define libstdc++-boot0 (inputs (%boot0-inputs)) (native-inputs '())))) -(define libstdc++-boot0-gcc7 +(define (make-libstdc++-boot0 gcc) ;; GCC >= 7 is needed by architectures which use C++-14 features. - (let ((lib (make-libstdc++ gcc-7))) + (let ((lib (make-libstdc++ gcc))) (package (inherit lib) (source (bootstrap-origin (package-source lib))) @@ -2446,7 +2446,8 @@ (define gcc-boot0 ;; The libstdc++ that libcc1 links against. ("libstdc++" ,(match (%current-system) - ("riscv64-linux" libstdc++-boot0-gcc7) + ("riscv64-linux" (make-libstdc++-boot0 gcc-7)) + ("x86_64-gnu" (make-libstdc++-boot0 gcc-14)) (_ libstdc++-boot0))) ;; Call it differently so that the builder can check whether -- 2.46.0