From patchwork Wed Nov 4 13:34:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 24989 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 432E827BBF4; Wed, 4 Nov 2020 13:35:22 +0000 (GMT) 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_H4,RCVD_IN_MSPIKE_WL,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 F04B427BBF3 for ; Wed, 4 Nov 2020 13:35:21 +0000 (GMT) Received: from localhost ([::1]:45178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaIwb-0005iA-65 for patchwork@mira.cbaines.net; Wed, 04 Nov 2020 08:35:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaIwJ-0005h3-3e for guix-patches@gnu.org; Wed, 04 Nov 2020 08:35:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36376) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kaIwI-0001wQ-Pf for guix-patches@gnu.org; Wed, 04 Nov 2020 08:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kaIwI-0003xH-Hs for guix-patches@gnu.org; Wed, 04 Nov 2020 08:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44440] [WIP PATCH 1/2] gnu: Use GCC 9 as the default compiler. Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Nov 2020 13:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44440@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160449688615172 (code B ref -1); Wed, 04 Nov 2020 13:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Nov 2020 13:34:46 +0000 Received: from localhost ([127.0.0.1]:47922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kaIw1-0003we-Lr for submit@debbugs.gnu.org; Wed, 04 Nov 2020 08:34:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:33086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kaIw0-0003wX-HU for submit@debbugs.gnu.org; Wed, 04 Nov 2020 08:34:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaIw0-0005KD-AY for guix-patches@gnu.org; Wed, 04 Nov 2020 08:34:44 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:54866) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaIvx-0001tj-S9 for guix-patches@gnu.org; Wed, 04 Nov 2020 08:34:44 -0500 Received: (qmail 30603 invoked by uid 1009); 4 Nov 2020 14:34:33 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25977. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.011035 secs); 04 Nov 2020 13:34:33 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 4 Nov 2020 14:34:33 +0100 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Wed, 4 Nov 2020 14:34:27 +0100 Message-Id: <20201104133427.4120918-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.29.1 MIME-Version: 1.0 Received-SPF: none client-ip=37.59.186.212; envelope-from=kuba@kadziolka.net; helo=pat.zlotemysli.pl X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/04 08:34:33 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 (gcc-toolchain-7): Use MAKE-GCC-TOOLCHAIN. (gcc-toolchain-9): Change to GCC-TOOLCHAIN. * gnu/packages/gcc (gcc): Change from GCC-7 to GCC-9. (gcc-objc): Change to GCC-OBJC-9. (gcc-objc++): Change to GCC-OBJC++-9. --- Dear Guix, this short patchstack switches the default toolchain to GCC 9 and fixes enough to get hello to compile. If my memory is correct, one of the cross-compiling target still breaks. I'm not interested in trying to figure out why, so I'm sending the WIP patches your way. Regards, Jakub Kądziołka gnu/packages/commencement.scm | 4 ++-- gnu/packages/gcc.scm | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1e1c370aa8..6347dd2e1d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3868,13 +3868,13 @@ is the GNU Compiler Collection.") (make-gcc-toolchain gcc-6)) (define-public gcc-toolchain-7 - gcc-toolchain) + (make-gcc-toolchain gcc-7)) (define-public gcc-toolchain-8 (make-gcc-toolchain gcc-8)) (define-public gcc-toolchain-9 - (make-gcc-toolchain gcc-9)) + gcc-toolchain) (define-public gcc-toolchain-10 (make-gcc-toolchain gcc-10)) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4d5aaa7070..ea576dfb8d 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -585,10 +586,9 @@ It also includes runtime support libraries for these languages."))) (patches (search-patches "gcc-9-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch")))))) -;; Note: When changing the default gcc version, update -;; the gcc-toolchain-* definitions and the gfortran definition -;; accordingly. -(define-public gcc gcc-7) +;; Note: When changing the default gcc version, update the definitions +;; for gcc-toolchain-{old,new}, gcc-objc and gcc-objc++. +(define-public gcc gcc-9) (define-public (make-libstdc++ gcc) "Return a libstdc++ package based on GCC. The primary use case is when @@ -826,7 +826,7 @@ provides the GNU compiler for the Go programming language.")) (custom-gcc gcc-10 "gcc-objc" '("objc") %objc-search-paths)) -(define-public gcc-objc gcc-objc-7) +(define-public gcc-objc gcc-objc-9) (define %objc++-search-paths (list (search-path-specification @@ -868,7 +868,7 @@ provides the GNU compiler for the Go programming language.")) (custom-gcc gcc-10 "gcc-objc++" '("obj-c++") %objc++-search-paths)) -(define-public gcc-objc++ gcc-objc++-7) +(define-public gcc-objc++ gcc-objc++-9) (define (make-libstdc++-doc gcc) "Return a package with the libstdc++ documentation for GCC."