diff options
Diffstat (limited to 'emulators/qemu/patches/patch-meson_build')
| -rw-r--r-- | emulators/qemu/patches/patch-meson_build | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/emulators/qemu/patches/patch-meson_build b/emulators/qemu/patches/patch-meson_build deleted file mode 100644 index 6109662..0000000 --- a/emulators/qemu/patches/patch-meson_build +++ /dev/null | |||
| @@ -1,56 +0,0 @@ | |||
| 1 | - localstatedir does not belong under prefix | ||
| 2 | - Remove hardcoding of optimization | ||
| 3 | - thread-posix: add support for setting threads name on OpenBSD | ||
| 4 | |||
| 5 | Index: meson.build | ||
| 6 | --- meson.build.orig | ||
| 7 | +++ meson.build | ||
| 8 | @@ -75,7 +75,7 @@ have_tools = get_option('tools') \ | ||
| 9 | .allowed() | ||
| 10 | have_ga = get_option('guest_agent') \ | ||
| 11 | .disable_auto_if(not have_system and not have_tools) \ | ||
| 12 | - .require(targetos in ['sunos', 'linux', 'windows', 'freebsd'], | ||
| 13 | + .require(targetos in ['sunos', 'linux', 'windows', 'freebsd', 'openbsd'], | ||
| 14 | error_message: 'unsupported OS for QEMU guest agent') \ | ||
| 15 | .allowed() | ||
| 16 | have_block = have_system or have_tools | ||
| 17 | @@ -1790,7 +1790,7 @@ config_host_data.set('CONFIG_QEMU_FIRMWAREPATH', qemu_ | ||
| 18 | config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') / get_option('libexecdir')) | ||
| 19 | config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') / qemu_icondir) | ||
| 20 | config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') / get_option('localedir')) | ||
| 21 | -config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('prefix') / get_option('localstatedir')) | ||
| 22 | +config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('localstatedir')) | ||
| 23 | config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / qemu_moddir) | ||
| 24 | config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / get_option('sysconfdir')) | ||
| 25 | |||
| 26 | @@ -2123,6 +2123,18 @@ config_host_data.set('CONFIG_PTHREAD_SETNAME_NP_WO_TID | ||
| 27 | pthread_create(&thread, 0, f, 0); | ||
| 28 | return 0; | ||
| 29 | }''', dependencies: threads)) | ||
| 30 | +config_host_data.set('CONFIG_PTHREAD_SET_NAME_NP', cc.links(gnu_source_prefix + ''' | ||
| 31 | + #include <pthread.h> | ||
| 32 | + #include <pthread_np.h> | ||
| 33 | + | ||
| 34 | + static void *f(void *p) { return NULL; } | ||
| 35 | + int main(void) | ||
| 36 | + { | ||
| 37 | + pthread_t thread; | ||
| 38 | + pthread_create(&thread, 0, f, 0); | ||
| 39 | + pthread_set_name_np(thread, "QEMU"); | ||
| 40 | + return 0; | ||
| 41 | + }''', dependencies: threads)) | ||
| 42 | config_host_data.set('CONFIG_PTHREAD_CONDATTR_SETCLOCK', cc.links(gnu_source_prefix + ''' | ||
| 43 | #include <pthread.h> | ||
| 44 | #include <time.h> | ||
| 45 | @@ -3756,11 +3768,9 @@ if targetos == 'darwin' | ||
| 46 | summary_info += {'Objective-C compiler': ' '.join(meson.get_compiler('objc').cmd_array())} | ||
| 47 | endif | ||
| 48 | summary_info += {'CFLAGS': ' '.join(get_option('c_args') | ||
| 49 | - + ['-O' + get_option('optimization')] | ||
| 50 | + (get_option('debug') ? ['-g'] : []))} | ||
| 51 | if link_language == 'cpp' | ||
| 52 | summary_info += {'CXXFLAGS': ' '.join(get_option('cpp_args') | ||
| 53 | - + ['-O' + get_option('optimization')] | ||
| 54 | + (get_option('debug') ? ['-g'] : []))} | ||
| 55 | endif | ||
| 56 | if targetos == 'darwin' | ||
