From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:53687) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iezGq-0001Q3-IL for guix-patches@gnu.org; Wed, 11 Dec 2019 05:31:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iezGo-000096-WD for guix-patches@gnu.org; Wed, 11 Dec 2019 05:31:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50974) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iezGo-00008S-SM for guix-patches@gnu.org; Wed, 11 Dec 2019 05:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iezGo-000727-Q7 for guix-patches@gnu.org; Wed, 11 Dec 2019 05:31:02 -0500 Subject: [bug#38436] [PATCH] gnu: Add gfortran-toolchain References: In-Reply-To: Resent-Message-ID: From: Konrad Hinsen Date: Wed, 11 Dec 2019 11:30:38 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: 38436@debbugs.gnu.org * gnu/packages/commencement.scm: (gfortran-toolchain): New variable. * gnu/packages/commencement.scm: (make-gcc-toolchain): Added argument "lang= uage" --- gnu/packages/commencement.scm | 54 ++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 68030376fc..e147836fc5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2517,16 +2517,29 @@ COREUTILS-FINAL vs. COREUTILS, etc." ;;; GCC toolchain. ;;; =20 -;; 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)) +;;; 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. + +;; The synopsis and description must be literal strings (not constructed +;; using string-append or format) to make them translatable. +(define gcc-synopsis + "Complete GCC tool chain for C/C++ development") +(define gcc-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 +and binaries, plus debugging symbols in the @code{debug} output), and +binutils.") =20 (define* (make-gcc-toolchain gcc - #:optional - (libc #f)) - "Return a complete toolchain for GCC. If LIBC is specified, target that = libc." + #:optional + (synopsis gcc-synopsis) + (description gcc-description) + (libc #f)) + "Return a complete toolchain for GCC. If SYNOPSIS and/or +DESCRIPTION are given, use them for documentation instead of the +defaults for the C/C++ toolchain. If LIBC is specified, target that libc." (let ((gcc (if libc (make-gcc-libc gcc libc) gcc)) (libc (if libc libc glibc-final))) (package @@ -2559,17 +2572,11 @@ COREUTILS-FINAL vs. COREUTILS, etc." (search-paths (package-search-paths gcc)) =20 (license (package-license gcc)) - (synopsis "Complete GCC tool chain for C/C++ development") - (description - "This package provides a complete GCC tool chain for C/C++ developm= ent to -be installed in user profiles. This includes GCC, as well as libc (head= ers -an d binaries, plus debugging symbols in the @code{debug} output), and Bi= nutils.") + (synopsis synopsis) + (description description) (home-page "https://gcc.gnu.org/") (outputs '("out" "debug" "static")) =20 - ;; The main raison d'=C3=AAtre of this "meta-package" is (1) to conv= eniently - ;; 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) @@ -2601,4 +2608,19 @@ an d binaries, plus debugging symbols in the @code{= debug} output), and Binutils (define-public gcc-toolchain-9 (make-gcc-toolchain gcc-9)) =20 +;; Provide the Fortran 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 gfortran-synopsis + "Complete GCC tool chain for Fortran development") +(define gfortran-description + "This package provides a complete GCC tool chain for Fortran 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.") + +(define-public gfortran-toolchain + (make-gcc-toolchain gfortran gfortran-synopsis gfortran-description)) + ;;; commencement.scm ends here --=20 2.24.0