From 280c22671f4a927ff57b651413951accc96935a6 Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Mon, 19 Jan 2026 11:02:49 +0800 Subject: [PATCH] support shared libxce(for api server) --- src/autoscaler/providers/meson.build | 2 +- src/controller/meson.build | 5 ++++- src/lib/meson.build | 6 ++++++ src/scheduler/meson.build | 1 + src/worker/meson.build | 8 ++++++-- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/autoscaler/providers/meson.build b/src/autoscaler/providers/meson.build index 2ad7e281..c2389b52 100644 --- a/src/autoscaler/providers/meson.build +++ b/src/autoscaler/providers/meson.build @@ -5,7 +5,7 @@ go_env.set('FIX_ENVARS','CGO_CFLAGS CGO_LDFLAGS') go_env.set('DEPENDENCIES','thread math') go_env.set('ENVARS', 'CURRENT_SOURCE_DIR BUILD_ROOT') -apiserver = custom_target('bcctool', +bcctool = custom_target('bcctool', input: 'baidu/src/bcctool/main.go', output: 'bcctool', command: [env_program, diff --git a/src/controller/meson.build b/src/controller/meson.build index d1ce176d..d0effc5c 100644 --- a/src/controller/meson.build +++ b/src/controller/meson.build @@ -26,7 +26,9 @@ incdir = include_directories('.', '../include', '../lib', controller_deps = [ libxce_dep, + c_capnproto_dep, math_dep, + tinylog_dep, thread_dep ] @@ -48,7 +50,8 @@ xce_test_deps = [ struct2json_dep, readline_dep, history_dep, - ncurses_dep + ncurses_dep, + tinylog_dep, ] xce_test = executable('xce_test', xce_test_src, diff --git a/src/lib/meson.build b/src/lib/meson.build index ba5b75cc..2ac51470 100644 --- a/src/lib/meson.build +++ b/src/lib/meson.build @@ -53,12 +53,18 @@ ssl_dep = dependency('openssl') libxce_deps = [c_capnproto_dep, ssl_dep, tinylog_dep, thread_dep] +libxce_shared = shared_library('xce', + libxce_src, + include_directories: [incdir, build_inc], + dependencies: libxce_deps, + install: true) libxce = static_library('xce', libxce_src, include_directories: [incdir, build_inc], dependencies: libxce_deps, install: true) + libxce_dep = declare_dependency(link_with: libxce) libxce_test_src = ['testsuite/test.c', diff --git a/src/scheduler/meson.build b/src/scheduler/meson.build index 44feb8bd..e19e4ec1 100644 --- a/src/scheduler/meson.build +++ b/src/scheduler/meson.build @@ -19,6 +19,7 @@ incdir = include_directories('src', scheduler_deps = [ libxce_dep, math_dep, + tinylog_dep, thread_dep ] diff --git a/src/worker/meson.build b/src/worker/meson.build index 364c6ada..3cb1a8f9 100644 --- a/src/worker/meson.build +++ b/src/worker/meson.build @@ -38,7 +38,8 @@ xcecd_worker_deps = [ elogind_dep, sqlite3_dep, struct2json_dep, - yaml_deps + yaml_deps, + tinylog_dep, ] xcecd_worker = executable('xcecd_worker', @@ -52,7 +53,10 @@ xrun_srcs = [ 'src/xrun.c' ] -xrun_deps = [libxce_dep] +xrun_deps = [ + libxce_dep, + tinylog_dep, +] xrun = executable('xrun', xrun_srcs,