mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 21:46:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: sharutils: Prepare for GCC 10.

Browse source 
* gnu/packages/compression.scm (sharutils)[source](snippet): Add substitution
to avoid duplicate header definitions.
[arguments]: Remove trailing #t.
This commit is contained in:
Marius Bakke 2021-05-19 00:27:10 +02:00
parent c1947a8c7d
commit 9fe4e45be7
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/compression.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2019, 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2016, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2016, 2018, 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
@ -672,6 +672,7 @@ (define-public sharutils
(modules '((guix build utils)))
(snippet
'(begin
;; Adjust for newer libc versions.
(substitute* (find-files "lib" "\\.c$")
(("#if defined _IO_ftrylockfile")
"#if defined _IO_EOF_SEEN"))
@ -681,7 +682,13 @@ (define-public sharutils
"# define _IO_IN_BACKUP 0x100\n"
"#endif\n\n"
"/* BSD stdio derived implementations")))
#t))))
;; ... and for newer GCC with -fno-common.
(substitute* '("src/shar-opts.h"
"src/unshar-opts.h"
"src/uudecode-opts.h"
"src/uuencode-opts.h")
(("char const \\* const program_name" all)
(string-append "extern " all)))))))
(build-system gnu-build-system)
(inputs
`(("which" ,which)))
@ -693,8 +700,7 @@ (define-public sharutils
;; in fact test data
(lambda _
(substitute* "tests/shar-1.ok"
(((which "sh")) "/bin/sh"))
#t)))))
(((which "sh")) "/bin/sh")))))))
(home-page "https://www.gnu.org/software/sharutils/")
(synopsis "Archives in shell scripts, uuencode/uudecode")
(description