25 lines
1.4 KiB
Text
25 lines
1.4 KiB
Text
- localstatedir does not belong under prefix
|
|
- Remove hardcoding of optimization
|
|
|
|
Index: meson.build
|
|
--- meson.build.orig
|
|
+++ meson.build
|
|
@@ -1802,7 +1802,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_
|
|
config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') / get_option('libexecdir'))
|
|
config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') / qemu_icondir)
|
|
config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') / get_option('localedir'))
|
|
-config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('prefix') / get_option('localstatedir'))
|
|
+config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('localstatedir'))
|
|
config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / qemu_moddir)
|
|
config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_option('sysconfdir'))
|
|
|
|
@@ -3810,9 +3810,6 @@ if targetos == 'darwin'
|
|
summary_info += {'Objective-C compiler': ' '.join(meson.get_compiler('objc').cmd_array())}
|
|
endif
|
|
option_cflags = (get_option('debug') ? ['-g'] : [])
|
|
-if get_option('optimization') != 'plain'
|
|
- option_cflags += ['-O' + get_option('optimization')]
|
|
-endif
|
|
summary_info += {'CFLAGS': ' '.join(get_option('c_args') + option_cflags)}
|
|
if link_language == 'cpp'
|
|
summary_info += {'CXXFLAGS': ' '.join(get_option('cpp_args') + option_cflags)}
|