summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Aumüller <aumuell@reserv.at>2023-08-24 03:11:02 +0200
committerGitHub <noreply@github.com>2023-08-24 03:11:02 +0200
commit43854fc2ec9826331c82e65ebf59fed986341805 (patch)
tree67d4e2bac95b567f8cbefd8f0240c07896bdeaf1
parent6a2149df6e2679bccf0dcf3875d05f03ee5b4a51 (diff)
downloadspack-43854fc2ec9826331c82e65ebf59fed986341805.tar.gz
spack-43854fc2ec9826331c82e65ebf59fed986341805.tar.bz2
spack-43854fc2ec9826331c82e65ebf59fed986341805.tar.xz
spack-43854fc2ec9826331c82e65ebf59fed986341805.zip
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
-rw-r--r--var/spack/repos/builtin/packages/ffmpeg/package.py7
1 files changed, 7 insertions, 0 deletions
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)