--- Begin Message ---
Subject: |
[PATCH] gnu: autogen: Fix build on i686. |
Date: |
Mon, 10 Apr 2023 18:33:47 +0000 |
* gnu/packages/autogen.scm (autogen): Fix build on i686.
---
gnu/packages/autogen.scm | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/autogen.scm b/gnu/packages/autogen.scm
index 9751e11a64..f9575b0dc9 100644
--- a/gnu/packages/autogen.scm
+++ b/gnu/packages/autogen.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -43,10 +44,15 @@ (define-public autogen
(base32 "16mlbdys8q4ckxlvxyhwkdnh1ay9f6g0cyp1kylkpalgnik398gq"))
(modules '((guix build utils)))
(snippet
- ;; Address '-Werror=format-overflow' error.
- '(substitute* "getdefs/getdefs.c"
- (("def_bf\\[[[:space:]]*MAXNAMELEN[[:space:]]*\\]")
- "def_bf[MAXNAMELEN + 10]")))))
+ '(begin
+ ;; Address '-Werror=format-overflow' error.
+ (substitute* "getdefs/getdefs.c"
+ (("def_bf\\[[[:space:]]*MAXNAMELEN[[:space:]]*\\]")
+ "def_bf[MAXNAMELEN + 10]"))
+ ;; Address '-Werror=format-truncation' error on i686.
+ (substitute* "autoopts/usage.c"
+ (("vfmt\\[sizeof\\(vfmtfmt\\)\\]")
+ "vfmt[sizeof(vfmtfmt) + 6]"))))))
(build-system gnu-build-system)
(native-inputs (list pkg-config which))
(inputs (list guile-3.0 perl)) ; for doc generator mdoc
base-commit: ae5d3525348de562b84fc9faccf09fd6e06ab3df
--
2.39.2
--- End Message ---
--- Begin Message ---
Subject: |
Re: Fix for librsvg 2.40 on core-updates |
Date: |
Tue, 11 Apr 2023 13:58:29 +0200 |
Am Mon, Apr 10, 2023 at 07:00:16PM +0000 schrieb Kaelyn:
> I just mailed https://issues.guix.gnu.org/62758 to add a snippet to fix the
> build error. I used a similar approach as the existing snippet for fixing a
> format overflow error. (I also forgot to set the subject prefix to "PATCH
> core-updates" on the git send-mail command line.).
Thanks a lot, this looks like a good fix. I have just pushed it.
Andreas
--- End Message ---