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

32702e94 · Janneke Nieuwenhuizen <[email protected]> · 2025-01-02 14:35:55 +01:00

* 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

Commit: 32702e941d94bbc38db2c1906da4e2c38376f8bc
Parents: bfa45f12

Changes

1 files changed · +7 −4

File	Status	Add	Del	Content
gnu/packages/markup.scm	modified	+7	−4	View file

gnu/packages/markup.scm

View file

diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index aa5bd0f..85a9db1 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2022, 2024 Vinicius Monego <[email protected]>
 ;;; Copyright © 2023 Zheng Junjie <[email protected]>
 ;;; Copyright © 2023 Nicolas Graves <[email protected]>
-;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]>
+;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <[email protected]>
 ;;; Copyright © 2024 Ricardo Wurmus <[email protected]>
 ;;; Copyright © 2025 Vinicius Monego <[email protected]>
 ;;;
@@ -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"