Skip to contentSkip to conversation

meson: fix Cocoa option in summary

PATCH In review Chris Hofstaedtler 2 participants 2 messages Dec 28, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson: fix Cocoa option in summary

From: Chris Hofstaedtler <[email protected]>

Regression introduced in f9332757898.

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
index e864cdd155..9c152a85bd 100644
@@ -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()}
Signature · 1 line
2.29.2
#1 lore raw

Hi Chris,

Quoted 3 lines · Chris Hofstaedtler

From: Chris Hofstaedtler <[email protected]>

Regression introduced in f9332757898.

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

Fixes b4e312e953b ("configure: move cocoa option to Meson")
Quoted 19 lines
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
index e864cdd155..9c152a85bd 100644
@@ -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()}