diff options
author | Mike Crowe <mac@mcrowe.com> | 2015-12-02 15:54:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 10:20:50 +0000 |
commit | dbd02bda78d5c8bd4873f376d64b079339e0b388 (patch) | |
tree | 71a067fa9fa9eb516bcdd1d740606da7995b991a | |
parent | fda98598f0d8afb94d573eca6c7c262b8c0d599f (diff) | |
download | openembedded-core-contrib-dbd02bda78d5c8bd4873f376d64b079339e0b388.tar.gz |
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>
-rw-r--r-- | meta/recipes-multimedia/libav/libav.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc index e55038c2c2..a7da107dfd 100644 --- a/meta/recipes-multimedia/libav/libav.inc +++ b/meta/recipes-multimedia/libav/libav.inc @@ -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} \ |