summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/ffmpeg/Config.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index 383374ddbe..279f94f0d1 100644
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -3,7 +3,13 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
# No support for ARMv7-M in the ARM assembly logic
# Microblaze build affected by gcc PR71124 (infinite loop)
- default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M && !BR2_microblaze
+ # m68k coldfire causes a build failure, because the check for
+ # atomics (atomic_store) succeeds, which causes ffmpeg to
+ # think atomic intrinsics are available, while they are
+ # not. See https://patchwork.ozlabs.org/patch/756664/ and
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 for more
+ # details.
+ default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M && !BR2_microblaze && !BR2_m68k_cf
menuconfig BR2_PACKAGE_FFMPEG
bool "ffmpeg"
OpenPOWER on IntegriCloud