[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: gnu: inetutils: Fix build with GCC 10.
From: |
guix-commits |
Subject: |
04/05: gnu: inetutils: 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 3668405daa7291694114276165d1e5c5366ff9d7
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Dec 19 23:55:01 2020 +0100
gnu: inetutils: Fix build with GCC 10.
* gnu/packages/admin.scm (inetutils)[source](modules, snippet): New fields.
---
gnu/packages/admin.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 6489e74..8424f77 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -606,7 +606,20 @@ re-executing them as necessary.")
(patches (search-patches "inetutils-hurd.patch"))
(sha256
(base32
- "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"))))
+ "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Fix issues with GCC 10. Can be removed for versions >
1.9.4.
+ (substitute* "telnetd/utility.c"
+ (("int not42;")
+ "extern int not42;"))
+ (substitute* "ftpd/extern.h"
+ (("^jmp_buf errcatch;")
+ "extern jmp_buf errcatch;"))
+ (substitute* "ftpd/ftpd.c"
+ (("struct credentials cred;" all)
+ (string-append all "\njmp_buf errcatch;")))))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--localstatedir=/var"