From 38dbf0dc9542688740b29fc6717c422d47d707a4 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Fri, 26 May 2023 16:46:44 -0700 Subject: [PATCH] build: add mapped_ring_buffer_sources for inclusion We use this in various places but it relies on some static API in the libsysprof-capture. Make it available to the other libraries. --- src/libsysprof-capture/meson.build | 8 ++++++-- src/libsysprof-profile/meson.build | 5 +++-- src/libsysprof/meson.build | 4 +++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libsysprof-capture/meson.build b/src/libsysprof-capture/meson.build index f548f827..cea56e62 100644 --- a/src/libsysprof-capture/meson.build +++ b/src/libsysprof-capture/meson.build @@ -19,8 +19,11 @@ if not meson.is_subproject() install_headers(libsysprof_capture_headers, subdir: sysprof_header_subdir) endif -libsysprof_capture_sources = files([ +mapped_ring_buffer_sources = files([ 'mapped-ring-buffer.c', +]) + +libsysprof_capture_sources = files([ 'sysprof-address.c', 'sysprof-capture-condition.c', 'sysprof-capture-cursor.c', @@ -47,7 +50,8 @@ libsysprof_capture_deps = [ libsysprof_capture = static_library( 'sysprof-capture-@0@'.format(libsysprof_api_version), - libsysprof_capture_sources, + (libsysprof_capture_sources + + mapped_ring_buffer_sources), dependencies: libsysprof_capture_deps, c_args: [ '-DSYSPROF_CAPTURE_COMPILATION' ], diff --git a/src/libsysprof-profile/meson.build b/src/libsysprof-profile/meson.build index 9d53033b..6a1ef5d7 100644 --- a/src/libsysprof-profile/meson.build +++ b/src/libsysprof-profile/meson.build @@ -32,8 +32,9 @@ libsysprof_profile_deps = [ libsysprof_profile_static = static_library( 'sysprof-profile-@0@'.format(soname_major_version), - libsysprof_profile_public_sources + - libsysprof_profile_private_sources, + (libsysprof_profile_public_sources + + libsysprof_profile_private_sources + + mapped_ring_buffer_sources), include_directories: [include_directories('.'), ipc_include_dirs, diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build index a730ef11..fa0f5263 100644 --- a/src/libsysprof/meson.build +++ b/src/libsysprof/meson.build @@ -150,7 +150,9 @@ endif libsysprof_static = static_library( 'sysprof', - libsysprof_public_sources + libsysprof_private_sources, + (libsysprof_public_sources + + libsysprof_private_sources + + mapped_ring_buffer_sources), include_directories: [include_directories('.'), ipc_include_dirs,