diff mbox series

meson: fix static flag summary

Message ID 20200917140700.673171-1-lvivier@redhat.com
State New
Headers show
Series meson: fix static flag summary | expand

Commit Message

Laurent Vivier Sept. 17, 2020, 2:07 p.m. UTC
'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(-)

Comments

Paolo Bonzini Sept. 17, 2020, 2:25 p.m. UTC | #1
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

>

>
<div dir="auto">Oops. :)<div dir="auto"><br></div><div dir="auto">Paolo</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Il gio 17 set 2020, 16:07 Laurent Vivier &lt;<a href="mailto:lvivier@redhat.com">lvivier@redhat.com</a>&gt; ha scritto:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">&#39;static build:&#39; must display value of CONFIG_STATIC rather than value of<br>
CONFIG_TOOLS.<br>
<br>
Signed-off-by: Laurent Vivier &lt;<a href="mailto:lvivier@redhat.com" target="_blank" rel="noreferrer">lvivier@redhat.com</a>&gt;<br>

---<br>
 meson.build | 2 +-<br>
 1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/meson.build b/meson.build<br>
index 5421eca66a02..c174f0ab0948 100644<br>
--- a/meson.build<br>
+++ b/meson.build<br>
@@ -1374,7 +1374,7 @@ summary_info += {&#39;gprof enabled&#39;:     config_host.has_key(&#39;CONFIG_GPROF&#39;)}<br>
 summary_info += {&#39;sparse enabled&#39;:    meson.get_compiler(&#39;c&#39;).cmd_array().contains(&#39;cgcc&#39;)}<br>
 summary_info += {&#39;strip binaries&#39;:    get_option(&#39;strip&#39;)}<br>
 summary_info += {&#39;profiler&#39;:          config_host.has_key(&#39;CONFIG_PROFILER&#39;)}<br>
-summary_info += {&#39;static build&#39;:      config_host.has_key(&#39;CONFIG_TOOLS&#39;)}<br>
+summary_info += {&#39;static build&#39;:      config_host.has_key(&#39;CONFIG_STATIC&#39;)}<br>
 if targetos == &#39;darwin&#39;<br>
   summary_info += {&#39;Cocoa support&#39;: config_host.has_key(&#39;CONFIG_COCOA&#39;)}<br>
 endif<br>
-- <br>
2.26.2<br>
<br>
</blockquote></div>
Philippe Mathieu-Daudé Sept. 17, 2020, 2:43 p.m. UTC | #2
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>
Laurent Vivier Sept. 23, 2020, 5:07 p.m. UTC | #3
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
diff mbox series

Patch

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