libav: Correctly handle prefix=""

libav's build system seems to think that prefix="" means that it should
use its default of /usr/local. Setting a prefix of "/" appears to be
sufficient to make it do the right thing.

(From OE-Core rev: e43a394d6758c95d187ed48f33f9404f2e1dee26)

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mike Crowe 2015-12-02 15:54:08 +00:00 committed by Richard Purdie
parent fda98598f0
commit dbd02bda78
1 changed files with 5 additions and 1 deletions

View File

@ -57,13 +57,17 @@ PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
# Check codecs that require --enable-nonfree
USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes', '', d)}"
# libav will install in /usr/local if prefix is empty. Luckily,
# passing just "/" instead does the right thing.
nonempty_prefix = "${@bb.data.getVar('prefix', d, True) or '/'}"
EXTRA_OECONF = " \
--enable-shared \
--enable-pthreads \
${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
\
--cross-prefix=${TARGET_PREFIX} \
--prefix=${prefix} \
--prefix=${nonempty_prefix} \
\
--ld="${CCLD}" \
--arch=${TARGET_ARCH} \