From patchwork Tue Aug 17 10:19:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32145 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 B593027BC78; Tue, 17 Aug 2021 11:23:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 80BAD27BC6B for ; Tue, 17 Aug 2021 11:23:10 +0100 (BST) Received: from localhost ([::1]:56118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwFR-0001kl-Iu for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:23:09 -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 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" X-getmail-retrieved-from-mailbox: Patches * 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.