diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2017-01-30 22:59:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-05 09:22:16 +0000 |
commit | 34099fa18ce4dc83adfaa79ba9979b51bb0905fd (patch) | |
tree | 461174a673148192f7167f8c7616618d5cca4154 /meta/recipes-multimedia/ffmpeg | |
parent | 8243ebdbb7bccc4f9c6598ad7ccf991deb9039ed (diff) | |
download | poky-34099fa18ce4dc83adfaa79ba9979b51bb0905fd.tar.gz |
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
(From OE-Core rev: 68aad8d179161c5fec75bf311060d829e4346c9f)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.2.bb | 7 |
1 files changed, 7 insertions, 0 deletions
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" | |||
66 | # Check codecs that require --enable-nonfree | 66 | # Check codecs that require --enable-nonfree |
67 | USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" | 67 | USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'openssl' ], 'yes', '', d)}" |
68 | 68 | ||
69 | def cpu(d): | ||
70 | for arg in (d.getVar('TUNE_CCARGS') or '').split(): | ||
71 | if arg.startswith('-mcpu='): | ||
72 | return arg[6:] | ||
73 | return 'generic' | ||
74 | |||
69 | EXTRA_OECONF = " \ | 75 | EXTRA_OECONF = " \ |
70 | --disable-stripping \ | 76 | --disable-stripping \ |
71 | --enable-pic \ | 77 | --enable-pic \ |
@@ -90,6 +96,7 @@ EXTRA_OECONF = " \ | |||
90 | --shlibdir=${libdir} \ | 96 | --shlibdir=${libdir} \ |
91 | --datadir=${datadir}/ffmpeg \ | 97 | --datadir=${datadir}/ffmpeg \ |
92 | ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \ | 98 | ${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \ |
99 | --cpu=${@cpu(d)} \ | ||
93 | " | 100 | " |
94 | 101 | ||
95 | EXTRA_OECONF_append_linux-gnux32 = " --disable-asm" | 102 | EXTRA_OECONF_append_linux-gnux32 = " --disable-asm" |