From patchwork Mon Dec 2 15:01:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Konrad Hinsen X-Patchwork-Id: 16342 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 5FED7177E8; Mon, 2 Dec 2019 15:02:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 157AC177B7 for ; Mon, 2 Dec 2019 15:02:18 +0000 (GMT) Received: from localhost ([::1]:37008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibnDN-0001Hk-Ay for patchwork@mira.cbaines.net; Mon, 02 Dec 2019 10:02:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42615) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibnDF-0001FZ-30 for guix-patches@gnu.org; Mon, 02 Dec 2019 10:02:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibnD8-0003xy-SY for guix-patches@gnu.org; Mon, 02 Dec 2019 10:02:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32789) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibnD8-0003xX-KL for guix-patches@gnu.org; Mon, 02 Dec 2019 10:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibnD8-0006pV-FE for guix-patches@gnu.org; Mon, 02 Dec 2019 10:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38436] [PATCH] gnu: Add gfortran-toolchain References: In-Reply-To: Resent-From: Konrad Hinsen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2019 15:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38436 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38436@debbugs.gnu.org Received: via spool by 38436-submit@debbugs.gnu.org id=B38436.157529889026189 (code B ref 38436); Mon, 02 Dec 2019 15:02:02 +0000 Received: (at 38436) by debbugs.gnu.org; 2 Dec 2019 15:01:30 +0000 Received: from localhost ([127.0.0.1]:38762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibnCc-0006oJ-5P for submit@debbugs.gnu.org; Mon, 02 Dec 2019 10:01:30 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:56061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibnCZ-0006nu-JV for 38436@debbugs.gnu.org; Mon, 02 Dec 2019 10:01:28 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 1853A220E1; Mon, 2 Dec 2019 10:01:21 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 02 Dec 2019 10:01:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.net; h= from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=fm2; bh=heGKUlwUEQCd+dBnMbFnUzgRrX 9XM7iT6IqfdgFQerY=; b=dtaUoPrrV+26JAgOdZx/4rnFSDFfoETquW0SNioWEA jZCElEz+TSqb5kwvnkMXvINfSm0GVTaktQfW4lhyM2uiosB+cTywe2S/xpS9f/Qo kLvJWhqQDJF/WSnHJn2D5yz9GOv/9rXc/YOM30/VpyR+btSU6WOUlj2ZE6V86hao tg+0hivBAa3w07uhCMK/pHnckRAv/b5iCxY5QVZMRxmNwwYDqCPskXGBm9223kQL GQBUCpCaRH3Xl1AmW0bl/7Nls0mw8MN5NU1F9/3oapTAyJyYKsapeQFFKlN5v4/U lXMElmfGRPDC0/A1k+LEiJs8CQL7fTaIFd/8lUFpVsEA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=heGKUl wUEQCd+dBnMbFnUzgRrX9XM7iT6IqfdgFQerY=; b=vi09TthJTDkY5SYwvnCUrC VvtPE3TC4N4OPCNQhfXTcJNzsd3OFuxNdmsDlxtS23ij3EfSLfTIyyid32B5UtW8 zM2kWmC4gJ9wjNlMFHT0ScQWQMnWdRTftC+DeCpOjKMXgHEs/CNKp3kG29j8iwIa i+7inmt4HmIbdZuE8Am4Zt6ptmsqsN+1IQi9+QWKepyF2x1QiAgzOQe+/QMKbRbm lpKb5xUuUk7O9r3Ds+lQmTntLPpz+i35B+i3my6AZQz6Ts742bTZFevS+OEDuiPR ff2wSgkzqkkEhZxeGF8Xm0mfXfA2GZsVwodOw2/R48zyORoYUUS08PotN0HvXNmw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrudejhedgjeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkgggtgfesthhqredttd dtjeenucfhrhhomhepmfhonhhrrgguucfjihhnshgvnhcuoehkohhnrhgrugdrhhhinhhs vghnsehfrghsthhmrghilhdrnhgvtheqnecuffhomhgrihhnpehgnhhurdhorhhgnecukf hppeduleehrddvvddurddtrddvtdeinecurfgrrhgrmhepmhgrihhlfhhrohhmpehkohhn rhgrugdrhhhinhhsvghnsehfrghsthhmrghilhdrnhgvthenucevlhhushhtvghrufhiii gvpedt X-ME-Proxy: Received: from KHs-MacBook.local (soleil-ext.synchrotron-soleil.fr [195.221.0.206]) by mail.messagingengine.com (Postfix) with ESMTPA id EE52980060; Mon, 2 Dec 2019 10:01:20 -0500 (EST) From: Konrad Hinsen Date: Mon, 02 Dec 2019 16:01:19 +0100 Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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: (gfortran-toolchain): New variable. * gnu/packages/commencement.scm: (make-gcc-toolchain): Added argument "language" --- gnu/packages/commencement.scm | 52 +++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 18 deletions(-) ;;; commencement.scm ends here diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 6a382c7517..8c57af749e 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2515,16 +2515,23 @@ COREUTILS-FINAL vs. COREUTILS, etc." ;;; GCC toolchain. ;;; +;;; Toolchain packages combine everything needed for compilation, +;;; and ensure that ld-wrapper comes before binutils' ld in the +;;; user's profile, as otherwise dynamic library lookup would not +;;; work correctly. + ;; Using the following procedure, a gcc toolchain targeting glibc-2.27 can be ;; instantiated like this: ;; ;; (define-public gcc-glibc-2.27-toolchain ;; (make-gcc-toolchain gcc glibc-2.27)) -(define* (make-gcc-toolchain gcc - #:optional - (libc #f)) - "Return a complete toolchain for GCC. If LIBC is specified, target that libc." +(define* (make-gcc-toolchain language + gcc + #:optional + (libc #f)) + "Return a complete toolchain for GCC. If LIBC is specified, target that libc. + Insert LANGUAGE into the documentation strings." (let ((gcc (if libc (make-gcc-libc gcc libc) gcc)) (libc (if libc libc glibc-final))) (package @@ -2557,17 +2564,19 @@ COREUTILS-FINAL vs. COREUTILS, etc." (search-paths (package-search-paths gcc)) (license (package-license gcc)) - (synopsis "Complete GCC tool chain for C/C++ development") + (synopsis (format #f + "Complete GCC tool chain for ~a development" + language)) (description - "This package provides a complete GCC tool chain for C/C++ development to -be installed in user profiles. This includes GCC, as well as libc (headers -an d binaries, plus debugging symbols in the @code{debug} output), and Binutils.") + (format + #f + "This package provides a complete GCC tool chain for ~a development to +be installed in user profiles. This includes GCC, as well as libc (headers +and binaries, plus debugging symbols in the @code{debug} output), and Binutils." + language)) (home-page "https://gcc.gnu.org/") (outputs '("out" "debug" "static")) - ;; The main raison d'être of this "meta-package" is (1) to conveniently - ;; install everything that we need, and (2) to make sure ld-wrapper comes - ;; before Binutils' ld in the user's profile. (inputs `(("gcc" ,gcc) ("ld-wrapper" ,(car (assoc-ref %final-inputs "ld-wrapper"))) ("binutils" ,binutils-final) @@ -2576,27 +2585,34 @@ an d binaries, plus debugging symbols in the @code{debug} output), and Binutils ("libc-static" ,libc "static")))))) (define-public gcc-toolchain - (make-gcc-toolchain gcc-final)) + (make-gcc-toolchain "C/C++" gcc-final)) (define-public gcc-toolchain-4.8 - (make-gcc-toolchain gcc-4.8)) + (make-gcc-toolchain "C/C++" gcc-4.8)) (define-public gcc-toolchain-4.9 - (make-gcc-toolchain gcc-4.9)) + (make-gcc-toolchain "C/C++" gcc-4.9)) (define-public gcc-toolchain-5 - (make-gcc-toolchain gcc-5)) + (make-gcc-toolchain "C/C++" gcc-5)) (define-public gcc-toolchain-6 - (make-gcc-toolchain gcc-6)) + (make-gcc-toolchain "C/C++" gcc-6)) (define-public gcc-toolchain-7 gcc-toolchain) (define-public gcc-toolchain-8 - (make-gcc-toolchain gcc-8)) + (make-gcc-toolchain "C/C++" gcc-8)) (define-public gcc-toolchain-9 - (make-gcc-toolchain gcc-9)) + (make-gcc-toolchain "C/C++" gcc-9)) + +;; Provide the toolchain package only for the version of gfortran +;; that is used by Guix intenally to build Fortran libraries, +;; because combining code compiled with different versions can +;; cause problems. +(define-public gfortran-toolchain + (make-gcc-toolchain "Fortran" gfortran))