andreas pushed a commit to branch core-packages-team
in repository guix.
commit ffbf751ecdade3a2bc22d778eba7d132237c41ff
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Thu Jan 2 14:35:55 2025 +0100
gnu: discount: Update to 2.2.7d and fix build with gcc-14.
* gnu/packages/markup.scm (discount): Update to 2.2.7d.
[arguments]: In phase "configure", extend "CC" to relax gcc-14's strictness.
Change-Id: I28da4dcb05c928a6c361d894487aa96d956c7d6e
---
gnu/packages/markup.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index aa5bd0fc15..85a9db1a3c 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2022, 2024 Vinicius Monego <mon...@posteo.net>
;;; Copyright © 2023 Zheng Junjie <873216...@qq.com>
;;; Copyright © 2023 Nicolas Graves <ngra...@ngraves.fr>
-;;; Copyright © 2024 Janneke Nieuwenhuizen <jann...@gnu.org>
+;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <jann...@gnu.org>
;;; Copyright © 2024 Ricardo Wurmus <rek...@elephly.net>
;;; Copyright © 2025 Vinicius Monego <mon...@posteo.net>
;;;
@@ -283,7 +283,7 @@ documents in the ms and man formats, LaTeX, gemini, and
terminal output.")
(define-public discount
(package
(name "discount")
- (version "2.2.7")
+ (version "2.2.7d")
(source (origin
(method url-fetch)
(uri (string-append
@@ -291,7 +291,7 @@ documents in the ms and man formats, LaTeX, gemini, and
terminal output.")
"discount/discount-" version ".tar.bz2"))
(sha256
(base32
- "024mxv0gpvilyfczarcgy5m7h4lv6qvhjfpf5i73qkxhszjjn9mi"))))
+ "0lkvnysnnaw431dam3b8b1f0ln1iscas5wcgw0bxx35fjqg098hj"))))
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
@@ -311,7 +311,10 @@ documents in the ms and man formats, LaTeX, gemini, and
terminal output.")
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
- (setenv "CC" ,(cc-for-target))
+ (setenv "CC" (string-append
+ ,(cc-for-target)
+ " -g -O2"
+ " -Wno-error=incompatible-pointer-types"))
;; The ‘validate-runpath’ phase fails otherwise.
(setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))
(invoke "./configure.sh"
