From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YPBEMw2OG2F+JAAAgWs5BA (envelope-from ) for ; Tue, 17 Aug 2021 12:23:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uP/hLg2OG2G/JgAAbx9fmQ (envelope-from ) for ; Tue, 17 Aug 2021 10:23:09 +0000 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 3833527D96 for ; Tue, 17 Aug 2021 12:23:09 +0200 (CEST) Received: from localhost ([::1]:56118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwFP-0001kl-En for larch@yhetil.org; Tue, 17 Aug 2021 06:23:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwFL-0001ha-1S for guix-patches@gnu.org; Tue, 17 Aug 2021 06:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40227) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwFK-0004QM-Qk for guix-patches@gnu.org; Tue, 17 Aug 2021 06:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwFK-00042J-NC for guix-patches@gnu.org; Tue, 17 Aug 2021 06:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 03/21] gnu: gcc-boot0: Use libstdc++-boot0-gcc7 on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919576715469 (code B ref 50091); Tue, 17 Aug 2021 10:23:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:22:47 +0000 Received: from localhost ([127.0.0.1]:51772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwF5-00041R-8O for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:22:47 -0400 Received: from flashner.co.il ([178.62.234.194]:45906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwF4-00041E-8R for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:22:46 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 83A79402E0; Tue, 17 Aug 2021 10:22:40 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:01 +0300 Message-Id: <9a13706d4a6835b5cc250ce3ab9653ee2117d33a.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629195789; 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; bh=Bu9XXp47SvZSUSlzfg5MLIw8/wt/IBg2udM4q9Jkmr0=; b=oEE++H6hs40B2px8PrDw/GzFQ75UZqDuxLohTuhNUpQdmLUVwpbTeUmBBXWiuCm0gZu5Iq zwwupzqLv2J8ZmA3+XwgStK2S164aLHb/qIS4+dxgj6LddNnnT+13uDz4PSrgAn7Kpsbo5 NJOh3nbNuD/Sfd8gGeaKqfpfLn/CRg+C9FzWUmCzTDs4soI92DhnFORp3eJX8rQMfQBK/u uF6FdGivWyTedeIrSYVPjZcUiNG+sZLGmY1puLuEkaQ5kptnAA7bzreXCAiDYAWeyFh1fA 2TnD6Cv5ysv7PrfXuiGyv+2R9CVbjiQhFOGgwthIWOJGMnayhVe23TkNj8k+8w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629195789; a=rsa-sha256; cv=none; b=WMzpiSVfAO+3kVLJ0EiAxQp+EBucHNE/hOuUBsByI9WsG14FcKAz0drsIK5CGhfYBFaAgI /90/LgCe7hVwFKyged9y7oXmMDuUcQh/09YFdbtO+xZ6comXu8P7yCkx9+q/O4/XeCf5Ag beSZc4iMCqWMZzhjAPJ8P3II0Z0fbSfWVPdGORCOk2cdJhDHKHFZZ0NwanV1HilMAKVKbM bOvPDYbZ+k5i1VphHExx5HMQNFZ9XKzK1kMPaK6b+vQRtBeiU+kLkS6X+tiszNVf3gZgQM lBQar4aHWc8Kkz9lmLa1vPFLXSw9UvSvtngIvbiNY/pTCPDxBV6EEdUiZgfyHQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.58 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3833527D96 X-Spam-Score: 2.58 X-Migadu-Scanner: scn0.migadu.com X-TUID: 6JQZ2gOkqFVR * gnu/packages/commencement.scm (libstdc++-boot0-gcc7): New variable. (gcc-boot0)[inputs]: On riscv64-linux use libstdc++-boot0-gcc7 instead of libstdc++-boot0. --- gnu/packages/commencement.scm | 48 ++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d395b261c2..69cf30483d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2703,6 +2703,50 @@ exec " gcc "/bin/" program (inputs (%boot0-inputs)) (native-inputs '())))) +(define libstdc++-boot0-gcc7 + ;; GCC >= 7 is needed by architectures which use C++-14 features. + (let ((lib (make-libstdc++ gcc-7))) + (package + (inherit lib) + (source (bootstrap-origin (package-source lib))) + (name "libstdc++-boot0") + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + + ;; XXX: libstdc++.so NEEDs ld.so for some reason. + #:validate-runpath? #f + + ,@(substitute-keyword-arguments (package-arguments lib) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'unpack-gmp&co + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmp (assoc-ref %build-inputs "gmp-source")) + (mpfr (assoc-ref %build-inputs "mpfr-source")) + (mpc (assoc-ref %build-inputs "mpc-source"))) + + ;; To reduce the set of pre-built bootstrap inputs, build + ;; GMP & co. from GCC. + (for-each (lambda (source) + (invoke "tar" "xvf" source)) + (list gmp mpfr mpc)) + + ;; Create symlinks like `gmp' -> `gmp-x.y.z'. + ,@(map (lambda (lib) + ;; Drop trailing letters, as gmp-6.0.0a unpacks + ;; into gmp-6.0.0. + `(symlink ,(string-trim-right + (package-full-name lib "-") + char-set:letter) + ,(package-name lib))) + (list gmp-6.0 mpfr mpc)))))))))) + (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0))) + ("mpfr-source" ,(bootstrap-origin (package-source mpfr))) + ("mpc-source" ,(bootstrap-origin (package-source mpc))) + ,@(%boot0-inputs))) + (native-inputs '())))) + (define gcc-boot0 (package (inherit gcc) @@ -2814,7 +2858,9 @@ exec " gcc "/bin/" program ("binutils-cross" ,binutils-boot0) ;; The libstdc++ that libcc1 links against. - ("libstdc++" ,libstdc++-boot0) + ("libstdc++" ,(match (%current-system) + ("riscv64-linux" libstdc++-boot0-gcc7) + (_ libstdc++-boot0))) ;; Call it differently so that the builder can check whether ;; the "libc" input is #f. -- 2.32.0