aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-12-19 23:48:21 +0100
committerMarius Bakke <marius@gnu.org>2020-12-20 23:40:45 +0100
commitd69a4805229e391669bebe57888cfdccdd7dec23 (patch)
treeb843a0ea3b7622632feae11fcdde322694a42285 /gnu
parent1345c611bafb0a40af14f812d62c4cdaca3d2993 (diff)
downloadguix-d69a4805229e391669bebe57888cfdccdd7dec23.tar.gz
guix-d69a4805229e391669bebe57888cfdccdd7dec23.zip
gnu: cpio: Fix build with GCC 10.
* gnu/packages/cpio.scm (cpio)[source](modules, snippet): New fields.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/cpio.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/cpio.scm b/gnu/packages/cpio.scm
index 58b2f45937..2f7a7b2363 100644
--- a/gnu/packages/cpio.scm
+++ b/gnu/packages/cpio.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,7 +36,14 @@
version ".tar.bz2"))
(sha256
(base32
- "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga"))))
+ "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove superfluous declaration that trips GCC 10.
+ (substitute* "src/global.c"
+ (("char \\*program_name;")
+ ""))))))
(build-system gnu-build-system)
(home-page "https://www.gnu.org/software/cpio/")
(synopsis "Manage cpio and tar file archives")