[oe] [oe-commits] Richard Purdie : mkvtoolnix: fix build with B!=S

[Martin Jansa]

On Sat, Jun 21, 2014 at 05:24:46PM +0000, git at git.openembedded.org wrote:
> Module: meta-openembedded.git
> Branch: master
> Commit: e510f7547d583e8a93b5aaf786cbbd2ee5bacfdf
> URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=e510f7547d583e8a93b5aaf786cbbd2ee5bacfdf
> 
> Author: Richard Purdie <richard.purdie at linuxfoundation.org>
> Date:   Sat Jun 21 11:05:58 2014 +0200
> 
> mkvtoolnix: fix build with B!=S

This is only part of the fix

now it was failing with:
| checking for libEBML headers version >= 1.3.0... internal
| *** The internal version of the libEBML library is supposed to be used,
| *** but it was not found in "lib/libebml". If this is a clone from the
| *** git repository then submodules have to be initialized with the
| *** following two commands:
| ***
| *** git submodule init
| *** git submodule update
| Configure failed. The contents of all config.log files follows to aid debugging

because it was trying to use internal libebml missing in ${B}

I'll upgrade libebml recipe to required 1.3.0 (from 1.2.2).

> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> 
> ---
> 
>  meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
> index 3b8eb32..abb0e95 100644
> --- a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
> +++ b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
> @@ -26,7 +26,7 @@ EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
>  
>  # remove some hardcoded searchpaths
>  do_configure_prepend() {
> -    sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ac/ebml.m4
> +    sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ${S}/ac/ebml.m4
>  }
>  
>  # Yeah, no makefile
> 
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20140720/fccc05c2/attachment-0002.sig>