From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aCF9NdFT+l72SwAA0tVLHw (envelope-from ) for ; Mon, 29 Jun 2020 20:49:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 0CVMMdFT+l6HZwAA1q6Kng (envelope-from ) for ; Mon, 29 Jun 2020 20:49:21 +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 82E9B940214 for ; Mon, 29 Jun 2020 20:49:20 +0000 (UTC) Received: from localhost ([::1]:58944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq0iI-0000PG-VF for larch@yhetil.org; Mon, 29 Jun 2020 16:49:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq0i6-0000Ou-KZ for guix-patches@gnu.org; Mon, 29 Jun 2020 16:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jq0i6-0006ou-Bm for guix-patches@gnu.org; Mon, 29 Jun 2020 16:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jq0i6-00048s-9k for guix-patches@gnu.org; Mon, 29 Jun 2020 16:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42132] [PATCH] gnu: gfortran: Remove unusable versions. Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Jun 2020 20:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42132 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42132@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159346370815868 (code B ref -1); Mon, 29 Jun 2020 20:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jun 2020 20:48:28 +0000 Received: from localhost ([127.0.0.1]:49628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq0hX-00047s-P1 for submit@debbugs.gnu.org; Mon, 29 Jun 2020 16:48:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:57456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jq0hW-00047l-77 for submit@debbugs.gnu.org; Mon, 29 Jun 2020 16:48:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jq0hV-0000FI-Su for guix-patches@gnu.org; Mon, 29 Jun 2020 16:48:25 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:50278) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jq0hT-0006jf-Ln for guix-patches@gnu.org; Mon, 29 Jun 2020 16:48:25 -0400 Received: (qmail 32136 invoked by uid 1009); 29 Jun 2020 22:48:20 +0200 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/25857. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.015925 secs); 29 Jun 2020 20:48:20 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 29 Jun 2020 22:48:20 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Mon, 29 Jun 2020 22:48:19 +0200 Message-Id: <20200629204819.8685-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/06/29 16:36:56 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=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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-Scanner: scn0 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-Spam-Score: -0.01 X-TUID: 9nkCqoEyyBGJ The gfortran packages cannot be used without being wrapped with gfortran-toolchain. However, as the comment in (gnu packages commencement) explains, there cannot be more than one gfortran-toolchain package because of ABI issues. Thus, versions of gfortran other than the main one are useless. * gnu/packages/gcc.scm (gfortran-4.8, gfortran-4.9, gfortran-5, gfortran-6, gfortran-7, gfortran-8, gfortran-9): Remove variables. (gfortran): Define the gfortran package based on the gcc variable. --- gnu/packages/gcc.scm | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 0c5be69fbf..31d88f2e0b 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -687,48 +687,11 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) -(define-public gfortran-4.8 - (hidden-package - (custom-gcc gcc-4.8 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-4.9 - (hidden-package - (custom-gcc gcc-4.9 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-5 - (hidden-package - (custom-gcc gcc-5 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-6 - (hidden-package - (custom-gcc gcc-6 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-7 - (hidden-package - (custom-gcc gcc-7 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-8 - (hidden-package - (custom-gcc gcc-8 "gfortran" '("fortran") - %generic-search-paths))) - -(define-public gfortran-9 +(define-public gfortran (hidden-package - (custom-gcc gcc-9 "gfortran" '("fortran") + (custom-gcc gcc "gfortran" '("fortran") %generic-search-paths))) -(define-public gfortran - ;; Note: Update this when GCC changes! We cannot use - ;; (custom-gcc gcc "fortran" …) because that would lead to a package object - ;; that is not 'eq?' with GFORTRAN-5, and thus 'fold-packages' would - ;; report two gfortran@5 that are in fact identical. - gfortran-7) - (define-public libgccjit (package (inherit gcc-9) -- 2.27.0