meson: fix static flag summary

[PATCH] meson: fix static flag summary

Posted by Laurent Vivier 5 years, 4 months ago

'static build:' must display value of CONFIG_STATIC rather than value of
CONFIG_TOOLS.

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 5421eca66a02..c174f0ab0948 100644
--- a/meson.build
+++ b/meson.build
@@ -1374,7 +1374,7 @@ summary_info += {'gprof enabled':     config_host.has_key('CONFIG_GPROF')}
 summary_info += {'sparse enabled':    meson.get_compiler('c').cmd_array().contains('cgcc')}
 summary_info += {'strip binaries':    get_option('strip')}
 summary_info += {'profiler':          config_host.has_key('CONFIG_PROFILER')}
-summary_info += {'static build':      config_host.has_key('CONFIG_TOOLS')}
+summary_info += {'static build':      config_host.has_key('CONFIG_STATIC')}
 if targetos == 'darwin'
   summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')}
 endif
-- 
2.26.2

Re: [PATCH] meson: fix static flag summary

Posted by Paolo Bonzini 5 years, 4 months ago

Oops. :)

Paolo

Il gio 17 set 2020, 16:07 Laurent Vivier <lvivier@redhat.com> ha scritto:

> 'static build:' must display value of CONFIG_STATIC rather than value of
> CONFIG_TOOLS.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 5421eca66a02..c174f0ab0948 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1374,7 +1374,7 @@ summary_info += {'gprof enabled':
>  config_host.has_key('CONFIG_GPROF')}
>  summary_info += {'sparse enabled':
> meson.get_compiler('c').cmd_array().contains('cgcc')}
>  summary_info += {'strip binaries':    get_option('strip')}
>  summary_info += {'profiler':
> config_host.has_key('CONFIG_PROFILER')}
> -summary_info += {'static build':      config_host.has_key('CONFIG_TOOLS')}
> +summary_info += {'static build':
> config_host.has_key('CONFIG_STATIC')}
>  if targetos == 'darwin'
>    summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')}
>  endif
> --
> 2.26.2
>
>

Re: [PATCH] meson: fix static flag summary

Posted by Philippe Mathieu-Daudé 5 years, 4 months ago

On 9/17/20 4:07 PM, Laurent Vivier wrote:
> 'static build:' must display value of CONFIG_STATIC rather than value of
> CONFIG_TOOLS.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 5421eca66a02..c174f0ab0948 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1374,7 +1374,7 @@ summary_info += {'gprof enabled':     config_host.has_key('CONFIG_GPROF')}
>  summary_info += {'sparse enabled':    meson.get_compiler('c').cmd_array().contains('cgcc')}
>  summary_info += {'strip binaries':    get_option('strip')}
>  summary_info += {'profiler':          config_host.has_key('CONFIG_PROFILER')}
> -summary_info += {'static build':      config_host.has_key('CONFIG_TOOLS')}
> +summary_info += {'static build':      config_host.has_key('CONFIG_STATIC')}
>  if targetos == 'darwin'
>    summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')}
>  endif
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH] meson: fix static flag summary

Posted by Laurent Vivier 5 years, 4 months ago

Le 17/09/2020 à 16:07, Laurent Vivier a écrit :
> 'static build:' must display value of CONFIG_STATIC rather than value of
> CONFIG_TOOLS.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 5421eca66a02..c174f0ab0948 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1374,7 +1374,7 @@ summary_info += {'gprof enabled':     config_host.has_key('CONFIG_GPROF')}
>  summary_info += {'sparse enabled':    meson.get_compiler('c').cmd_array().contains('cgcc')}
>  summary_info += {'strip binaries':    get_option('strip')}
>  summary_info += {'profiler':          config_host.has_key('CONFIG_PROFILER')}
> -summary_info += {'static build':      config_host.has_key('CONFIG_TOOLS')}
> +summary_info += {'static build':      config_host.has_key('CONFIG_STATIC')}
>  if targetos == 'darwin'
>    summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')}
>  endif
> 

Applied to my trivial-patches branch.

Thanks,
Laurent