From 26e4693667be85e9e0d4d2d7a599fd91e0ae4d6c Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Mon, 25 Nov 2013 16:17:07 +0800
Subject: [PATCH] x264: install libraries to right directory when enable
 multilib

x264 use [EPREFIX/lib] as default libdir. When multlib is enabled that
is not right. Packages depends on x264 such as libav configure fails
that can't find library x264.

Pass the right libdir to configure script to fix it.

(From OE-Core master rev: d1deb07d158cf27bce2ee95e2f02b4fd1d00fe21)

(From OE-Core rev: baa97fc4baf4c87bb850b88a55144395b5c7e11e)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-multimedia/x264/x264_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index 295818ae98..406df30e64 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -25,6 +25,7 @@ X264_DISABLE_ASM_armv5 = "--disable-asm"
 
 EXTRA_OECONF = '--prefix=${prefix} \
                 --host=${HOST_SYS} \
+                --libdir=${libdir} \
                 --cross-prefix=${TARGET_PREFIX} \
                 --sysroot=${STAGING_DIR_TARGET} \
                 --enable-shared \