[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: gnu: cpio: Fix build with GCC 10.
|
From: |
guix-commits |
|
Subject: |
03/05: gnu: cpio: Fix build with GCC 10. |
|
Date: |
Sun, 20 Dec 2020 17:41:23 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit d69a4805229e391669bebe57888cfdccdd7dec23
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Dec 19 23:48:21 2020 +0100
gnu: cpio: Fix build with GCC 10.
* gnu/packages/cpio.scm (cpio)[source](modules, snippet): New fields.
---
gnu/packages/cpio.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cpio.scm b/gnu/packages/cpio.scm
index 58b2f45..2f7a7b2 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")