Re: [PATCH 06/10] libcheck: avoid multilib install file conflict

[Richard Purdie <richard.purdie@linuxfoundation.org>]

On Sat, 2018-09-29 at 13:43 +0800, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>
> 
> It has one line different which is a comment in check_stdint.h
> between libcheck multilib packages. And then causes install file
> conflict when install libcheck and lib32-libcheck at same time.
> 
> Remove the comment line from check_stdint.h to fix the issue.
> 
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>  meta/recipes-support/libcheck/libcheck_0.12.0.bb | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/meta/recipes-support/libcheck/libcheck_0.12.0.bb
> b/meta/recipes-support/libcheck/libcheck_0.12.0.bb
> index e646d43968..9969e27054 100644
> --- a/meta/recipes-support/libcheck/libcheck_0.12.0.bb
> +++ b/meta/recipes-support/libcheck/libcheck_0.12.0.bb
> @@ -16,6 +16,11 @@ inherit autotools pkgconfig texinfo
>  
>  CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk"
>  
> +do_install_append_class-target () {
> +    # remove the only one line comment which causes multilib install
> file conflict
> +    sed -i '/^\/\*/ d' ${D}${includedir}/check_stdint.h
> +}

Please do this with a patch, not a sed expression.

The sed expressions are a maintenance nightmare since we don't know
if/when the header may change, or if/when this expression stops
working.

Cheers,

Richard