varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix -Dagent=true -Dlibsysprof=false

Browse Source 
The agent is statically linked so that it doesn't require using a properly
working libsysprof to be installed. This ensures that it continues to build
properly in that case so it can be used from org.gnome.Sdk.
This commit is contained in:
Christian Hergert
2022-07-22 11:54:34 -07:00
parent a12177e447
commit 0dc0a5b3de
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -28,7 +28,7 @@ polkit_req_version = '>= 0.105'
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
if get_option('libsysprof') if get_option('libsysprof') or get_option('agent')
add_languages('cpp', native: false) add_languages('cpp', native: false)
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
endif endif
@ -197,6 +197,14 @@ int main(void) {
config_h.set10('HAVE_STDATOMIC_H', true) config_h.set10('HAVE_STDATOMIC_H', true)
endif endif
if get_option('libsysprof') or get_option('agent')
needs_service_access = true
endif
if needs_service_access or get_option('sysprofd') == 'bundled'
install_service_files = true
endif
subdir('src') subdir('src')
subdir('data') subdir('data')
subdir('po') subdir('po')

19
src/meson.build
View File

@ -8,7 +8,7 @@ sysprof_version_conf.set('MINOR_VERSION', sysprof_version[1])
sysprof_version_conf.set('MICRO_VERSION', sysprof_version[2]) sysprof_version_conf.set('MICRO_VERSION', sysprof_version[2])
sysprof_version_conf.set('VERSION', meson.project_version()) sysprof_version_conf.set('VERSION', meson.project_version())
if get_option('sysprofd') == 'bundled' or get_option('libsysprof') if needs_service_access
ipc_profiler_src = gnome.gdbus_codegen('ipc-profiler', ipc_profiler_src = gnome.gdbus_codegen('ipc-profiler',
sources: 'org.gnome.Sysprof3.Profiler.xml', sources: 'org.gnome.Sysprof3.Profiler.xml',
interface_prefix: 'org.gnome.Sysprof3.', interface_prefix: 'org.gnome.Sysprof3.',
@ -32,18 +32,15 @@ if get_option('sysprofd') == 'bundled' or get_option('libsysprof')
interface_prefix: 'org.gnome.Sysprof.', interface_prefix: 'org.gnome.Sysprof.',
namespace: 'Ipc', namespace: 'Ipc',
) )
install_data(['org.gnome.Sysprof3.Service.xml',
'org.gnome.Sysprof2.xml',
'org.gnome.Sysprof.Agent.xml'],
install_dir: join_paths(datadir, 'dbus-1/interfaces'),
)
endif endif
org_gnome_Sysprof3_Profiler_xml = files(['org.gnome.Sysprof3.Profiler.xml']) if install_service_files
install_data([
if get_option('libsysprof') 'org.gnome.Sysprof2.xml',
install_data(org_gnome_Sysprof3_Profiler_xml, 'org.gnome.Sysprof3.Profiler.xml',
'org.gnome.Sysprof3.Service.xml',
'org.gnome.Sysprof.Agent.xml'
],
install_dir: join_paths(datadir, 'dbus-1/interfaces'), install_dir: join_paths(datadir, 'dbus-1/interfaces'),
) )
endif endif