From 68aad8d179161c5fec75bf311060d829e4346c9f Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 30 Jan 2017 22:59:50 +0100 Subject: ffmpeg: disable cpu autodetection Just pass the correct -mcpu= configure switch (fallback to generic). Avoids warnings like: | warning: switch -mcpu=cortex-a15 conflicts with -march=armv7-a switch Signed-off-by: Andreas Oberritter Signed-off-by: Ross Burton --- meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb index 66718c4b37..c376d82dfc 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb @@ -66,6 +66,12 @@ PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv" # Check codecs that require --enable-nonfree USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" +def cpu(d): + for arg in (d.getVar('TUNE_CCARGS') or '').split(): + if arg.startswith('-mcpu='): + return arg[6:] + return 'generic' + EXTRA_OECONF = " \ --disable-stripping \ --enable-pic \ @@ -90,6 +96,7 @@ EXTRA_OECONF = " \ --shlibdir=${libdir} \ --datadir=${datadir}/ffmpeg \ ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \ + --cpu=${@cpu(d)} \ " EXTRA_OECONF_append_linux-gnux32 = " --disable-asm" -- cgit 1.2.3-korg