[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/09: gnu: gcc: Phases no longer return a Boolean.
From: |
guix-commits |
Subject: |
09/09: gnu: gcc: Phases no longer return a Boolean. |
Date: |
Tue, 24 Nov 2020 18:07:54 -0500 (EST) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 16111ad11c9a0345bb4c05f49a8e40413da1ea93
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Nov 25 00:05:55 2020 +0100
gnu: gcc: Phases no longer return a Boolean.
* gnu/packages/gcc.scm (gcc-4.7, gcc-4.9)
(make-libiberty, custom-gcc, libgccjit)
(make-libstdc++-doc, isl, gnu-c-manual): Remove trailing #t from
phases.
---
gnu/packages/gcc.scm | 33 +++++++++++----------------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 4e01a7a..18aaa0b 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -320,8 +320,7 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
;; but there's nothing useful to look for here.)
(substitute* "gcc/config.in"
(("PREFIX_INCLUDE_DIR")
- "PREFIX_INCLUDE_DIR_isnt_necessary_here"))
- #t)))
+ "PREFIX_INCLUDE_DIR_isnt_necessary_here")))))
(add-after 'configure 'post-configure
(lambda _
@@ -329,8 +328,7 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'.
(substitute* "Makefile"
(("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest)
- "TOPLEVEL_CONFIGURE_ARGUMENTS=\n"))
- #t)))))
+ "TOPLEVEL_CONFIGURE_ARGUMENTS=\n")))))))
(native-search-paths
;; Use the language-specific variables rather than 'CPATH' because they
@@ -446,8 +444,7 @@ Go. It also includes runtime support libraries for these
languages.")
":"))
(format #t
"environment variable `CPLUS_INCLUDE_PATH'
changed to ~a~%"
- (getenv "CPLUS_INCLUDE_PATH"))
- #t))))))))))
+ (getenv "CPLUS_INCLUDE_PATH"))))))))))))
(define-public gcc-5
;; Note: GCC >= 5 ships with .info files but 'make install' fails to install
@@ -647,16 +644,14 @@ using compilers other than GCC."
(modify-phases %standard-phases
(add-before 'configure 'chdir
(lambda _
- (chdir "libiberty")
- #t))
+ (chdir "libiberty")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib/"))
(include (string-append out "/include/")))
(install-file "libiberty.a" lib)
- (install-file "../include/libiberty.h" include))
- #t)))))
+ (install-file "../include/libiberty.h" include)))))))
(inputs '())
(outputs '("out"))
(native-inputs '())
@@ -698,8 +693,7 @@ as the 'native-search-paths' field."
(lambda* (#:key outputs #:allow-other-keys)
(for-each delete-file
(find-files (string-append (assoc-ref outputs "out")
"/bin")
-
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))
- #t))))))))
+
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))))))))))
(define %generic-search-paths
;; This is the language-neutral search path for GCC. Entries in $CPATH are
@@ -753,8 +747,7 @@ as the 'native-search-paths' field."
(lambda* (#:key outputs #:allow-other-keys)
(for-each delete-file
(find-files (string-append (assoc-ref outputs "out")
"/bin")
-
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))
- #t))))))
+
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))))))))
(synopsis "GCC library generating machine code on-the-fly at runtime")
(description
"This package is part of the GNU Compiler Collection and provides an
@@ -887,8 +880,7 @@ provides the GNU compiler for the Go programming
language."))
#:phases (modify-phases %standard-phases
(add-before 'configure 'chdir
(lambda _
- (chdir "libstdc++-v3")
- #t))
+ (chdir "libstdc++-v3")))
(add-before 'configure 'set-xsl-directory
(lambda* (#:key inputs #:allow-other-keys)
(let ((docbook (assoc-ref inputs
"docbook-xsl")))
@@ -897,8 +889,7 @@ provides the GNU compiler for the Go programming
language."))
(("@XSL_STYLE_DIR@")
(string-append
docbook "/xml/xsl/"
- (strip-store-file-name docbook))))
- #t)))
+ (strip-store-file-name docbook)))))))
(replace 'build
(lambda _
;; XXX: There's also a 'doc-info' target, but it
@@ -955,8 +946,7 @@ provides the GNU compiler for the Go programming
language."))
;; libtool looks for it in the usual locations.
(substitute* (string-append out "/lib/libisl.la")
(("^old_library=.*")
- "old_library=''\n"))
- #t))))))
+ "old_library=''\n"))))))))
(inputs `(("gmp" ,gmp)))
(home-page "http://isl.gforge.inria.fr/")
(synopsis
@@ -1082,8 +1072,7 @@ effective code.")
(copy-file file
(string-append html "/"
file)))
- (find-files "." "\\.html$"))
- #t))))))
+ (find-files "." "\\.html$"))))))))
(synopsis "Reference manual for the C programming language")
(description
"This is a reference manual for the C programming language, as
- branch core-updates updated (cf495c9 -> 16111ad), guix-commits, 2020/11/24
- 01/09: gnu: gsl: Demote conditional phase logic., guix-commits, 2020/11/24
- 02/09: gnu: gsl: Build shared libraries only., guix-commits, 2020/11/24
- 06/09: build-system/texlive: Phases no longer return a Boolean., guix-commits, 2020/11/24
- 04/09: gnu: base, commencement: Remove trailing #t from build phases., guix-commits, 2020/11/24
- 05/09: build-system/minify: Phases no longer return a Boolean., guix-commits, 2020/11/24
- 08/09: gnu: base, gcc: Removing trailing #t from snippets., guix-commits, 2020/11/24
- 03/09: build-system/gnu: Ignore the result of phase procedures., guix-commits, 2020/11/24
- 07/09: packages: Ignore return value of origin snippets., guix-commits, 2020/11/24
- 09/09: gnu: gcc: Phases no longer return a Boolean.,
guix-commits <=