From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:43242) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBcpn-0006Lz-RW for guix-patches@gnu.org; Tue, 10 Mar 2020 07:14:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBcpm-0005ye-KL for guix-patches@gnu.org; Tue, 10 Mar 2020 07:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45971) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBcpm-0005yL-GZ for guix-patches@gnu.org; Tue, 10 Mar 2020 07:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBcpm-0000Uk-CC for guix-patches@gnu.org; Tue, 10 Mar 2020 07:14:02 -0400 Subject: [bug#40009] [core-updates PATCH]: Use per-architecture GCC for libstdc++-boot0 Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:42230) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBcpI-0005xw-A5 for guix-patches@gnu.org; Tue, 10 Mar 2020 07:13:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBcpH-0004GF-6P for guix-patches@gnu.org; Tue, 10 Mar 2020 07:13:32 -0400 Received: from flashner.co.il ([178.62.234.194]:52520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jBcpG-000375-DC for guix-patches@gnu.org; Tue, 10 Mar 2020 07:13:31 -0400 Received: from localhost (unknown [141.226.13.108]) by flashner.co.il (Postfix) with ESMTPSA id 1261B400E5 for ; Tue, 10 Mar 2020 11:12:58 +0000 (UTC) Date: Tue, 10 Mar 2020 13:12:27 +0200 From: Efraim Flashner Message-ID: <20200310111227.GX1423@E5400> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="POjlveFHrWq2ZO+N" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40009@debbugs.gnu.org --POjlveFHrWq2ZO+N Content-Type: multipart/mixed; boundary="AdjLlRqdF7kYRNze" Content-Disposition: inline --AdjLlRqdF7kYRNze Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable I've tested this on aarch64 and there were no problems. It also provides a nice framework for other architectures as they become supported. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --AdjLlRqdF7kYRNze Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-libstdc-boot0-Use-per-architecture-gcc-versions.patch" Content-Transfer-Encoding: quoted-printable =46rom 4506c48da7df4397d459337988adbdd54c0d440d Mon Sep 17 00:00:00 2001 =46rom: Efraim Flashner Date: Thu, 13 Feb 2020 10:47:34 +0200 Subject: [PATCH 1/2] gnu: libstdc++-boot0: Use per-architecture gcc version= s. * gnu/packages/commencement.scm (libstdc++-boot0): Use a version of gcc more closely tied to their bootstrap process. --- gnu/packages/commencement.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2a0a83ad49..b5cb08a19a 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3,7 +3,7 @@ ;;; Copyright =C2=A9 2014 Andreas Enge ;;; Copyright =C2=A9 2012 Nikita Karetnikov ;;; Copyright =C2=A9 2014, 2015, 2017 Mark H Weaver -;;; Copyright =C2=A9 2017, 2018, 2019 Efraim Flashner +;;; Copyright =C2=A9 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Jan (janneke) Nieuwenhuizen ;;; Copyright =C2=A9 2019 Marius Bakke @@ -1427,9 +1427,12 @@ exec " gcc "/bin/" program (define libstdc++-boot0 ;; GCC's libcc1 is always built as a shared library (the top-level ;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to ref= er - ;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on - ;; C++14 features missing in some of our bootstrap compilers. - (let ((lib (make-libstdc++ gcc-4.9))) + ;; to libstdc++.so. We therefore use a version of GCC which most closely + ;; matches the bootstrap compiler of that architecture. + (let ((lib (make-libstdc++ + (match (%current-system) + ("aarch64-linux" gcc-5) + (_ gcc-4.9))))) (package (inherit lib) (source (bootstrap-origin (package-source lib))) --=20 2.25.0 --AdjLlRqdF7kYRNze-- --POjlveFHrWq2ZO+N Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl5ndhsACgkQQarn3Mo9 g1FUyQ/+IE3W2nA8awkl0Qn6SSZZvp2oA3tinfg7uQ7FUMn9VZc6HKynnODEXKGq P5RZ9XH2tXrlEUAHF0JUTgiWYF5yi6M0pmuYyKRh7GzmqoHZ5tHNbNjVpKajFYz3 ysUyySnErAtzQQOJs8mrzv/UitBFLG/Iit82I898O5zazGPqLRGowkEkQdacJ+O0 HTbtHIRqOGmXcpDTNHNQTwe35rEoaVsSt+c+G8F3E7Dsh6VTHSAtc93hhPTDVRW+ fcBvJE4x4Xvj4S5p3nL+4Hr/gNH08JpEtqiaIjv5MyabjZwK09864CvqGHJf8dqN lLBBSRUcfozyq+1K0SCLVsSeG8lcFut2lRxq2o1Tm18MPtD8Zr3VJcAyiw6Duktw wGiCNB0GGaCqOMtCC7rqR8v2FmN0hIzO8GBaCTVVZ+QbOrcAneYlqP5tiajTaWgB 0fzSu5RBBrAiypIajY07SE5lBKwMRY8u1k1NhHRYWtA0Sx4mHdOkaTLcarmvnS/X eipJe5bNEtOkeVOCYT2hHFOqWgrCKX43SX/YI8E4ceQMwaUNbdb2mxBItH8zEoEk P18sgYdva2KSk+Oaqw8j+86SPCpNGtMbo5yPhf7c0EX+/xtx794WwWPs87E6P1WB HUs4/rWG61i29B3wiGo0orRJHOf59M0Zq7wDC2pZOT8UA05w0IQ= =4p36 -----END PGP SIGNATURE----- --POjlveFHrWq2ZO+N--