From 0573f462564b061574ff1f98df440d313419a996 Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Sun, 15 Dec 2019 21:51:10 +0000 Subject: [PATCH] OpenBSD: -lkvm and use PID_MAX --- meson.build | 8 ++++++++ src/bin/edi_debug.c | 4 ---- src/lib/meson.build | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 3e46e24..1b0b2ce 100644 --- a/meson.build +++ b/meson.build @@ -25,6 +25,13 @@ config_h.set_quoted('EFL_BETA_API_SUPPORT' , '1') elm = dependency('elementary', version : '>=1.22.0') top_inc = include_directories('.') +host_os = host_machine.system() + +deps_os = declare_dependency(link_args : [] ) +if host_os == 'openbsd' + deps_os = declare_dependency(link_args : [ '-lkvm' ]) +endif + cc = meson.get_compiler('c') config_h.set_quoted('EFL_CFLAGS', run_command(find_program('pkg-config'), '--libs', '--cflags', 'elementary').stdout().strip()) @@ -50,6 +57,7 @@ if build_machine.system() == 'darwin' endif endif + if get_option('libclang') == true #check for the header diff --git a/src/bin/edi_debug.c b/src/bin/edi_debug.c index a0ed3f4..8a9f9b8 100644 --- a/src/bin/edi_debug.c +++ b/src/bin/edi_debug.c @@ -86,10 +86,6 @@ _system_pid_max_get(void) fclose(f); pid_max = atoi(buf); } -#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) - int mib[2] = { CTL_KERN, KERN_MAXPROC }; - size_t len = sizeof(pid_max); - sysctl(mib, 2, &pid_max, &len, NULL, 0); #elif defined(PID_MAX) pid_max = PID_MAX; #endif diff --git a/src/lib/meson.build b/src/lib/meson.build index 5001a49..9d948cd 100644 --- a/src/lib/meson.build +++ b/src/lib/meson.build @@ -29,7 +29,7 @@ src = files([ lib_dir = include_directories('.') edi_lib_lib = shared_library('edi', src, - dependencies : [elm], + dependencies : [elm, deps_os], include_directories : top_inc, version : meson.project_version(), install : true