summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-21 22:26:50 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-10-25 12:35:17 +0200
commit3300e00ffb4a166a7f3f27eb759c5d73df405cba (patch)
treed5a0e7a67b43d165ff582411816cd65c521daca5
parent0ac115d546c305b277326e9a509fec8b06025796 (diff)
downloadbuildroot-3300e00ffb4a166a7f3f27eb759c5d73df405cba.tar.gz
buildroot-3300e00ffb4a166a7f3f27eb759c5d73df405cba.zip
ffmpeg: fix ARM condition for --{enable, disable}-vfp
As noted by Arnout, not all ARMv6 have the VFP FPU, therefore instead of using a condition on ARMv6 or ARMv7-A, this commit changes to use a condition on BR2_ARM_CPU_HAS_VFPV2. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-rw-r--r--package/ffmpeg/ffmpeg.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 349bac9bf3..0990f1878a 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -285,7 +285,7 @@ FFMPEG_CONF_OPTS += --enable-armv6
else
FFMPEG_CONF_OPTS += --disable-armv6 --disable-armv6t2
endif
-ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y)
+ifeq ($(BR2_ARM_CPU_HAS_VFPV2),y)
FFMPEG_CONF_OPTS += --enable-vfp
else
FFMPEG_CONF_OPTS += --disable-vfp
OpenPOWER on IntegriCloud