diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2016-08-15 17:03:37 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-08-26 17:16:19 +0200 |
| commit | 30a87d332779f8dda1260ad7947c5482427cd447 (patch) | |
| tree | e8f4806f75909e57f1a4f6d2303d74d42601241c | |
| parent | 2893d2f22c757edc3cfc6bc8fff8d2dbd7f7fe1a (diff) | |
| download | buildroot-30a87d332779f8dda1260ad7947c5482427cd447.tar.gz buildroot-30a87d332779f8dda1260ad7947c5482427cd447.zip | |
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 <Vincent.Riera@imgtec.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Thomas:
- group with the other --cpu conditions so that only one is passed.
- improve the comment.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 7 |
1 files changed, 6 insertions, 1 deletions
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 |
