diff options
| -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" | |||
| 57 | # Check codecs that require --enable-nonfree | 57 | # Check codecs that require --enable-nonfree |
| 58 | USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes', '', d)}" | 58 | USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes', '', d)}" |
| 59 | 59 | ||
| 60 | # libav will install in /usr/local if prefix is empty. Luckily, | ||
| 61 | # passing just "/" instead does the right thing. | ||
| 62 | nonempty_prefix = "${@bb.data.getVar('prefix', d, True) or '/'}" | ||
| 63 | |||
| 60 | EXTRA_OECONF = " \ | 64 | EXTRA_OECONF = " \ |
| 61 | --enable-shared \ | 65 | --enable-shared \ |
| 62 | --enable-pthreads \ | 66 | --enable-pthreads \ |
| 63 | ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \ | 67 | ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \ |
| 64 | \ | 68 | \ |
| 65 | --cross-prefix=${TARGET_PREFIX} \ | 69 | --cross-prefix=${TARGET_PREFIX} \ |
| 66 | --prefix=${prefix} \ | 70 | --prefix=${nonempty_prefix} \ |
| 67 | \ | 71 | \ |
| 68 | --ld="${CCLD}" \ | 72 | --ld="${CCLD}" \ |
| 69 | --arch=${TARGET_ARCH} \ | 73 | --arch=${TARGET_ARCH} \ |
