janneke pushed a commit to branch core-packages-team
in repository guix.
commit 277684abf29243843ff557ce7cb2632079ef03c8
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Sat Jan 4 17:18:05 2025 +0100
gnu: mplayer: Fix build with gcc-14.
* gnu/packages/video.scm (mplayer)[arguments]: In stage "configure", fixup
"CFLAGS" in "config.mak" to relax gcc-14's strictness.
Change-Id: I21e66222770182bfdb09092ef04b372d12690710
---
gnu/packages/video.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ef2083d1f5..242c030e6e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2016 Dmitry Nikolaev <camelthe...@gmail.com>
;;; Copyright © 2016, 2017 Nikita <nik...@n0.is>
;;; Copyright © 2016, 2018, 2019, 2020, 2021 Eric Bavier <bav...@posteo.net>
-;;; Copyright © 2016, 2024 Janneke Nieuwenhuizen <jann...@gnu.org>
+;;; Copyright © 2016, 2024, 2025 Janneke Nieuwenhuizen <jann...@gnu.org>
;;; Copyright © 2017 Feng Shu <tuma...@163.com>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <m...@tobias.gr>
;;; Copyright © 2017 Chris Marusich <cmmarus...@gmail.com>
@@ -2625,7 +2625,15 @@ streaming protocols.")
(("#! /bin/sh") (string-append "#!" (which "sh"))))
(setenv "SHELL" (which "bash"))
(setenv "CONFIG_SHELL" (which "bash"))
- (apply invoke "./configure" configure-flags))))))
+ (apply invoke "./configure" configure-flags)
+ ;; Adding CFLAGS to #:configure-flags, or setting it in the
+ ;; enviroment does not work. Adding CFLAGS to #:make-flags
+ ;; breaks the build.
+ (substitute* "config.mak"
+ (("CFLAGS *=" all)
+ (string-append all
+ " -Wno-error=incompatible-pointer-types"
+ " -Wno-error=int-conversion"))))))))
;; FIXME: Add additional inputs once available.
(native-inputs
(list pkg-config yasm))
