guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: ffmpeg: Fix build on i686 with binutils 2.41.


From: guix-commits
Subject: 02/02: gnu: ffmpeg: Fix build on i686 with binutils 2.41.
Date: Wed, 28 Aug 2024 17:19:06 -0400 (EDT)

civodul pushed a commit to branch core-updates
in repository guix.

commit 4ea2a8dba055209ac48244460597135a82c31bb7
Author: André Batista <nandre@riseup.net>
AuthorDate: Tue Aug 27 15:46:26 2024 -0300

    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
---
 gnu/packages/video.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index f7d58ab8f5..ac89562a55 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1835,6 +1835,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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]