diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2025-01-02 14:35:55 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:21 +0200 |
| commit | 32702e941d94bbc38db2c1906da4e2c38376f8bc (patch) | |
| tree | d1d136f4e14db122094120e039661f6ebd15fff8 /gnu | |
| parent | bfa45f122c13082fdf11e649d18363a929fce91d (diff) | |
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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/markup.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index aa5bd0fc15a..85a9db1a3cf 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2022, 2024 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> -;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2025 Vinicius Monego <monego@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" |