andreas pushed a commit to branch core-packages-team
in repository guix.

commit 74fe07ca772a2e0fcc9819eeb9aa03c9eaca49dc
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Mon Dec 9 10:16:50 2024 +0100
    gnu: hplip: Update to 3.24.4 and fix build with gcc-14.
    
    * gnu/packages/cups.scm (hplip): Update to 3.24.4.
    [arguments]: Add "set-gcc-14-cflags" phase to relax gcc-14's strictness.
    
    Change-Id: Ie753c9ebb51f08c4683e9a9762e9c269eceb5e22
---
 gnu/packages/cups.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 41c3f0af45..23aa66a047 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2021, 2023, 2024 Maxim Cournoyer <maxim.courno...@gmail.com>
 ;;; Copyright © 2023 Zheng Junjie <873216...@qq.com>
 ;;; Copyright © 2025 Lukas Gradl <lgr...@posteo.net>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <jann...@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -600,6 +601,18 @@ should only be used as part of the Guix cups-pk-helper 
service.")
               "--disable-qt4")
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'set-gcc-14-cflags
+            ;; We set CFLAGS here because adding setting it in
+            ;; #:configure-flags or #:make-flags does not work.
+            (lambda _
+              (substitute* "Makefile.in"
+                (("CFLAGS = @CFLAGS@" all)
+                 (string-append all
+                                " -Wno-error=attributes"
+                                " -Wno-error=implicit-function-declaration"
+                                " -Wno-error=implicit-int"
+                                " -Wno-error=incompatible-pointer-types"
+                                " -Wno-error=return-mismatch")))))
           (add-after 'unpack 'fix-hard-coded-file-names
             (lambda* (#:key inputs outputs #:allow-other-keys)
               (let ((out #$output)

Reply via email to