[v1] meson: fix Cocoa option in summary

[PATCH] meson: fix Cocoa option in summary

Chris Hofstaedtler posted 1 patch 4 years, 10 months ago

Diff against v2
Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20201228150958.232564-1-zeha@debian.org

There is a newer version of this series

meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] meson: fix Cocoa option in summary

Posted by Chris Hofstaedtler 4 years, 10 months ago

From: Chris Hofstaedtler <chris@hofstaedtler.name>

Regression introduced in f9332757898.

Signed-off-by: Chris Hofstaedtler <chris@hofstaedtler.name>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index e864cdd155..9c152a85bd 100644
--- a/meson.build
+++ b/meson.build
@@ -2112,7 +2112,7 @@ 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_STATIC')}
 if targetos == 'darwin'
-  summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')}
+  summary_info += {'Cocoa support': config_host_data.get('CONFIG_COCOA', false)}
 endif
 # TODO: add back version
 summary_info += {'SDL support':       sdl.found()}
-- 
2.29.2

Re: [PATCH] meson: fix Cocoa option in summary

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

Hi Chris,

On 12/28/20 4:09 PM, Chris Hofstaedtler wrote:
> From: Chris Hofstaedtler <chris@hofstaedtler.name>
> 
> Regression introduced in f9332757898.

Isn't it commit b4e312e953b? If so you could add:

Fixes: b4e312e953b ("configure: move cocoa option to Meson")

> Signed-off-by: Chris Hofstaedtler <chris@hofstaedtler.name>
> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index e864cdd155..9c152a85bd 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2112,7 +2112,7 @@ 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_STATIC')}
>  if targetos == 'darwin'
> -  summary_info += {'Cocoa support': config_host.has_key('CONFIG_COCOA')}
> +  summary_info += {'Cocoa support': config_host_data.get('CONFIG_COCOA', false)}
>  endif
>  # TODO: add back version
>  summary_info += {'SDL support':       sdl.found()}
>