From 9fe4e45be705f98d89e1e49e6ca0c444a9aca00e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 May 2021 00:27:10 +0200 Subject: gnu: sharutils: Prepare for GCC 10. * gnu/packages/compression.scm (sharutils)[source](snippet): Add substitution to avoid duplicate header definitions. [arguments]: Remove trailing #t. --- gnu/packages/compression.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3dbe517f93..8a077c484b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2019, 2020 Kei Kebreau -;;; Copyright © 2016, 2018, 2019, 2020 Marius Bakke +;;; Copyright © 2016, 2018, 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2017 Nikita ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Theodoros Foradis @@ -672,6 +672,7 @@ decompressors when faced with corrupted input.") (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 @@ decompressors when faced with corrupted input.") "# 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 @@ decompressors when faced with corrupted input.") ;; 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 -- cgit v1.2.3 From de47177400d475b042439d99df6d53beda20f6d1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 May 2021 00:28:17 +0200 Subject: gnu: sharutils: 'which' is a native input. * gnu/packages/compression.scm (sharutils)[inputs]: Rename to ... [native-inputs]: ... this. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8a077c484b..746a496c90 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -690,7 +690,7 @@ decompressors when faced with corrupted input.") (("char const \\* const program_name" all) (string-append "extern " all))))))) (build-system gnu-build-system) - (inputs + (native-inputs `(("which" ,which))) (arguments `(#:phases -- cgit v1.2.3