From 30a87d332779f8dda1260ad7947c5482427cd447 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 15 Aug 2016 17:03:37 +0200 Subject: [PATCH] package/ffmpeg: default to --cpu=generic for MIPS architecture This option is needed to prevent this message from configure: WARNING: unknown CPU. Disabling all MIPS optimizations. Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls [Thomas: - group with the other --cpu conditions so that only one is passed. - improve the comment.] Signed-off-by: Thomas Petazzoni --- package/ffmpeg/ffmpeg.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index a816ceac29..91e7fa979a 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -449,12 +449,17 @@ else FFMPEG_CONF_OPTS += --disable-pic endif -ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),) +# Default to --cpu=generic for MIPS architecture, in order to avoid a +# warning from ffmpeg's configure script. +ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y) +FFMPEG_CONF_OPTS += --cpu=generic +else ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),) FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_CPU) else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),) FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH) endif + FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF)) # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others