summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Batista <nandre@riseup.net>2024-08-27 15:46:26 -0300
committerLudovic Courtès <ludo@gnu.org>2024-08-31 10:45:48 +0200
commit2bfa848a41335869354a67578a5c4bbb21a3b9aa (patch)
treef51105c76df52be54addfd285f232e808b44f648
parentcbfa5ed392828f1d7ccd0a9cc272baf4a4807f92 (diff)
downloadguix-patches-2bfa848a41335869354a67578a5c4bbb21a3b9aa.tar
guix-patches-2bfa848a41335869354a67578a5c4bbb21a3b9aa.tar.gz
gnu: ffmpeg: Fix build on i686 with binutils 2.41.
* gnu/packages/video.scm (ffmpeg): Add 'bypass-openal-check phase which breaks configure phase on i686. Unconditionally set openal configure check to true. Co-authored-by: Ludovic Courtès <ludo@gnu.org> Change-Id: Iddba489690a42a5e9f9a40f9a238c658ddac6e20
-rw-r--r--gnu/packages/video.scm12
1 files changed, 12 insertions, 0 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 462daf2867..ac9fabeb38 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1836,6 +1836,18 @@ operate properly.")
"--disable-mipsfpu")
#:phases
#~(modify-phases %standard-phases
+ #$@(if (target-x86-32?)
+ #~((add-before 'configure 'bypass-openal-check
+ ;; configure fails linking to openal when using binutils
+ ;; >= 2.38 due to openal's usage of protected visibility
+ ;; for its dynamic symbols. Bypass this configure time
+ ;; check for now. See:
+ ;; https://lists.gnu.org/archive/html/guix-devel/2024-08/msg00159.html
+ (lambda _
+ (substitute* "configure"
+ (("alGetError \\|\\|")
+ "alGetError \|\| true \|\|")))))
+ #~())
(replace 'configure
;; configure does not work followed by "SHELL=..." and
;; "CONFIG_SHELL=..."; set environment variables instead