summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2024-12-09 10:16:50 +0100
committerAndreas Enge <andreas@enge.fr>2025-07-18 20:17:12 +0200
commitfcf21654e44fddb4573113b88aa72ef7ffe139e6 (patch)
treea535d58b35b1aae19d682b65ba5de1c81abca45e
parent8136ff2d48b12892c262aea086533f94234f4792 (diff)
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
-rw-r--r--gnu/packages/cups.scm13
1 files changed, 13 insertions, 0 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 469c694f06..820de6bda3 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2025 Lukas Gradl <lgradl@posteo.net>
;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -654,6 +655,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)