ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: base, gcc: Removing trailing #t from snippets.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2020-11-25 00:01:09 +01:00
parent 325d00e619
commit 3504e39a5d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/base.scm
View file

@ -1335,11 +1335,9 @@ (define-public libiconv
(snippet (snippet
;; Work around "declared gets" error on glibc systems (fixed by ;; Work around "declared gets" error on glibc systems (fixed by
;; Gnulib commit 66712c23388e93e5c518ebc8515140fa0c807348.) ;; Gnulib commit 66712c23388e93e5c518ebc8515140fa0c807348.)
'(begin '(substitute* "srclib/stdio.in.h"
(substitute* "srclib/stdio.in.h" (("^#undef gets") "")
(("^#undef gets") "") (("^_GL_WARN_ON_USE \\(gets.*") "")))))
(("^_GL_WARN_ON_USE \\(gets.*") ""))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(synopsis "Character set conversion library") (synopsis "Character set conversion library")
(description (description

40
gnu/packages/gcc.scm
View file

@ -378,15 +378,13 @@ (define-public gcc-4.8
;; This is required for building with glibc-2.26. ;; This is required for building with glibc-2.26.
;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712
(snippet (snippet
'(begin '(for-each
(for-each (lambda (dir)
(lambda (dir) (substitute* (string-append "libgcc/config/"
(substitute* (string-append "libgcc/config/" dir "/linux-unwind.h")
dir "/linux-unwind.h") (("struct ucontext") "ucontext_t")))
(("struct ucontext") "ucontext_t"))) '("aarch64" "alpha" "bfin" "i386" "m68k"
'("aarch64" "alpha" "bfin" "i386" "m68k" "pa" "sh" "tilepro" "xtensa")))))
"pa" "sh" "tilepro" "xtensa"))
#t))))
(supported-systems %supported-systems) (supported-systems %supported-systems)
(inputs (inputs
`(("isl" ,isl-0.11) `(("isl" ,isl-0.11)
@ -414,15 +412,13 @@ (define-public gcc-4.9
;; This is required for building with glibc-2.26. ;; This is required for building with glibc-2.26.
;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712 ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712
(snippet (snippet
'(begin '(for-each
(for-each (lambda (dir)
(lambda (dir) (substitute* (string-append "libgcc/config/"
(substitute* (string-append "libgcc/config/" dir "/linux-unwind.h")
dir "/linux-unwind.h") (("struct ucontext") "ucontext_t")))
(("struct ucontext") "ucontext_t"))) '("aarch64" "alpha" "bfin" "i386" "m68k" "nios2"
'("aarch64" "alpha" "bfin" "i386" "m68k" "nios2" "pa" "sh" "tilepro" "xtensa")))))
"pa" "sh" "tilepro" "xtensa"))
#t))))
;; Override inherited texinfo-5 with latest version. ;; Override inherited texinfo-5 with latest version.
(native-inputs `(("perl" ,perl) ;for manpages (native-inputs `(("perl" ,perl) ;for manpages
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))
@ -483,11 +479,9 @@ (define-public gcc-5
;; ;;
;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67590 ;; https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67590
;; http://cgit.openembedded.org/openembedded-core/commit/?id=f6e47aa9b12f9ab61530c40e0343f451699d9077 ;; http://cgit.openembedded.org/openembedded-core/commit/?id=f6e47aa9b12f9ab61530c40e0343f451699d9077
'(begin '(substitute* "libcc1/configure"
(substitute* "libcc1/configure" (("\\$gcc_cv_objdump -T")
(("\\$gcc_cv_objdump -T") "$OBJDUMP_FOR_TARGET -T")))))
"$OBJDUMP_FOR_TARGET -T"))
#t))))
(inputs (inputs
`(;; GCC5 needs <isl/band.h> which is removed in later versions. `(;; GCC5 needs <isl/band.h> which is removed in later versions.
("isl" ,isl-0.18) ("isl" ,isl-0.18)