From 6a2691a2bb66bd0497e458b0a00414507e8e99c0 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Tue, 27 Nov 2018 12:54:32 +0100 Subject: [PATCH] media-video/ffmpeg: Pass disable optimization to configure. This is only useful for hardcoded CFLAGS. We use optflags that override them anyway. However, some configure checks run with fomit-frame-pointer when this is enabled. This lures the build system it has enough registers to build some inline asm on x86 and then causes build failures. Closes: https://bugs.gentoo.org/671746 Closes: https://bugs.gentoo.org/645778 Package-Manager: Portage-2.3.51, Repoman-2.3.12 RepoMan-Options: --force Signed-off-by: Alexis Ballier --- media-video/ffmpeg/ffmpeg-4.1.ebuild | 4 ++++ media-video/ffmpeg/ffmpeg-9999.ebuild | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.ebuild index 951667d5553c..4b16f79189e4 100644 --- a/media-video/ffmpeg/ffmpeg-4.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.1.ebuild @@ -405,6 +405,10 @@ multilib_src_configure() { --enable-avfilter --enable-avresample --disable-stripping + # This is only for hardcoded cflags; those are used in configure checks that may + # interfere with proper detections, bug #671746 and bug #645778 + # We use optflags, so that overrides them anyway. + --disable-optimizations --disable-libcelt # bug #664158 "${myconf[@]}" ) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index ca3506a2918a..869c06071cf3 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -404,6 +404,10 @@ multilib_src_configure() { --enable-avfilter --enable-avresample --disable-stripping + # This is only for hardcoded cflags; those are used in configure checks that may + # interfere with proper detections, bug #671746 and bug #645778 + # We use optflags, so that overrides them anyway. + --disable-optimizations --disable-libcelt # bug #664158 "${myconf[@]}" ) -- 2.26.2