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:08 +0000 |
| commit | e43a394d6758c95d187ed48f33f9404f2e1dee26 (patch) | |
| tree | f6584519a765d3f87ed0328d320cdf9af4e01895 | |
| parent | 896c27d45d77a2bb57b3cd350b60f1bd97dd13dc (diff) | |
| download | openembedded-core-contrib-e43a394d6758c95d187ed48f33f9404f2e1dee26.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.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -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} \ |