From 43854fc2ec9826331c82e65ebf59fed986341805 Mon Sep 17 00:00:00 2001 From: Martin Aumüller Date: Thu, 24 Aug 2023 03:11:02 +0200 Subject: ffmpeg: apply upstream fix for build with binutils 2.41 (#39392) While spack does not yet provide binutils 2.41, they might still be installed. However, building ffmpeg on x86_64 fails with multiple errors like this: ./libavcodec/x86/mathops.h:125: Error: operand type mismatch for `shr' also reported here: https://trac.ffmpeg.org/ticket/10405 --- var/spack/repos/builtin/packages/ffmpeg/package.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index 26805d9743..cfc1db119c 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -111,6 +111,13 @@ class Ffmpeg(AutotoolsPackage): when="@5.1.2", ) + # Patch fixing a build failure with binutils 2.41.0 + patch( + "https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/effadce6c756247ea8bae32dc13bb3e6f464f0eb", + sha256="d1ea47c29968507fee772234bc734d29958b62ab92400801ef28559b538a9168", + when="@6.0", + ) + @property def libs(self): return find_libraries("*", self.prefix, recursive=True) -- cgit v1.2.3-70-g09d2