diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-11-25 00:01:09 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-11-25 00:02:30 +0100 |
| commit | 3504e39a5d8661b02a026b6ab3b386e3f49eeeaf (patch) | |
| tree | d1a2779da3138e9e9cacf88f3999757c618e996f /gnu | |
| parent | 325d00e61993ddaa674f6e85e099d570866f8258 (diff) | |
| download | guix-3504e39a5d8661b02a026b6ab3b386e3f49eeeaf.tar.gz | |
gnu: base, gcc: Removing trailing #t from snippets.
* gnu/packages/base.scm (libiconv)[source]: Remove trailing #t from 'snippet'. * gnu/packages/gcc.scm (gcc-4.8)[source]: Likewise. (gcc-4.9)[source]: Likewise. (gcc-5)[source]: Likewise.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/gcc.scm | 40 |
2 files changed, 20 insertions, 28 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3979dbc2e7..bd352319a1 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1335,11 +1335,9 @@ and daylight-saving rules.") (snippet ;; Work around "declared gets" error on glibc systems (fixed by ;; Gnulib commit 66712c23388e93e5c518ebc8515140fa0c807348.) - '(begin - (substitute* "srclib/stdio.in.h" - (("^#undef gets") "") - (("^_GL_WARN_ON_USE \\(gets.*") "")) - #t)))) + '(substitute* "srclib/stdio.in.h" + (("^#undef gets") "") + (("^_GL_WARN_ON_USE \\(gets.*") ""))))) (build-system gnu-build-system) (synopsis "Character set conversion library") (description diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4d5aaa7070..4e01a7af61 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -378,15 +378,13 @@ Go. It also includes runtime support libraries for these languages.") ;; This is required for building with glibc-2.26. ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 (snippet - '(begin - (for-each - (lambda (dir) - (substitute* (string-append "libgcc/config/" - dir "/linux-unwind.h") - (("struct ucontext") "ucontext_t"))) - '("aarch64" "alpha" "bfin" "i386" "m68k" - "pa" "sh" "tilepro" "xtensa")) - #t)))) + '(for-each + (lambda (dir) + (substitute* (string-append "libgcc/config/" + dir "/linux-unwind.h") + (("struct ucontext") "ucontext_t"))) + '("aarch64" "alpha" "bfin" "i386" "m68k" + "pa" "sh" "tilepro" "xtensa"))))) (supported-systems %supported-systems) (inputs `(("isl" ,isl-0.11) @@ -414,15 +412,13 @@ Go. It also includes runtime support libraries for these languages.") ;; This is required for building with glibc-2.26. ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 (snippet - '(begin - (for-each - (lambda (dir) - (substitute* (string-append "libgcc/config/" - dir "/linux-unwind.h") - (("struct ucontext") "ucontext_t"))) - '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2" - "pa" "sh" "tilepro" "xtensa")) - #t)))) + '(for-each + (lambda (dir) + (substitute* (string-append "libgcc/config/" + dir "/linux-unwind.h") + (("struct ucontext") "ucontext_t"))) + '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2" + "pa" "sh" "tilepro" "xtensa"))))) ;; Override inherited texinfo-5 with latest version. (native-inputs `(("perl" ,perl) ;for manpages ("texinfo" ,texinfo))) @@ -483,11 +479,9 @@ Go. It also includes runtime support libraries for these languages.") ;; ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67590 ;; http://cgit.openembedded.org/openembedded-core/commit/?id=f6e47aa9b12f9ab61530c40e0343f451699d9077 - '(begin - (substitute* "libcc1/configure" - (("\\$gcc_cv_objdump -T") - "$OBJDUMP_FOR_TARGET -T")) - #t)))) + '(substitute* "libcc1/configure" + (("\\$gcc_cv_objdump -T") + "$OBJDUMP_FOR_TARGET -T"))))) (inputs `(;; GCC5 needs <isl/band.h> which is removed in later versions. ("isl" ,isl-0.18) |