amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: discount: Update to 2.2.7d and fix build with gcc-14.

Browse source 
* 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
This commit is contained in:
Janneke Nieuwenhuizen 2025-01-02 14:35:55 +01:00 • committed by Andreas Enge
parent bfa45f122c
commit 32702e941d
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/markup.scm
View file

@ -13,7 +13,7 @@
;;; Copyright © 2022, 2024 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2022, 2024 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> ;;; 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 © 2024 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2025 Vinicius Monego <monego@posteo.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 (define-public discount
(package (package
(name "discount") (name "discount")
(version "2.2.7") (version "2.2.7d")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -291,7 +291,7 @@ documents in the ms and man formats, LaTeX, gemini, and terminal output.")
"discount/discount-" version ".tar.bz2")) "discount/discount-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"024mxv0gpvilyfczarcgy5m7h4lv6qvhjfpf5i73qkxhszjjn9mi")))) "0lkvnysnnaw431dam3b8b1f0ln1iscas5wcgw0bxx35fjqg098hj"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -311,7 +311,10 @@ documents in the ms and man formats, LaTeX, gemini, and terminal output.")
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (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. ;; The ‘validate-runpath’ phase fails otherwise.
(setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))
(invoke "./configure.sh" (invoke "./configure.sh"