From 5fa137cc0d973bddb1959154f5e840ca48821c65 Mon Sep 17 00:00:00 2001 From: Pauli Virtanen Date: Wed, 23 Jul 2025 13:59:05 +0300 Subject: [PATCH] meson.build: make spa-json-dump available for subprojects Add override that provides host binary for subprojects to use. Also fix cross-compilation to use the host binary. --- spa/meson.build | 7 +++++++ spa/tools/meson.build | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/spa/meson.build b/spa/meson.build index 5087c0073..1137adf60 100644 --- a/spa/meson.build +++ b/spa/meson.build @@ -18,6 +18,13 @@ spa_dep = declare_dependency( }, ) +spa_inc_dep = declare_dependency( + include_directories : [ + include_directories('include'), + include_directories('include-private'), + ], +) + meson.override_dependency('lib@0@'.format(spa_name), spa_dep) pkgconfig.generate(filebase : 'lib@0@'.format(spa_name), diff --git a/spa/tools/meson.build b/spa/tools/meson.build index 9508e65ca..60e66b55c 100644 --- a/spa/tools/meson.build +++ b/spa/tools/meson.build @@ -6,6 +6,12 @@ executable('spa-monitor', 'spa-monitor.c', dependencies : [ spa_dep, dl_lib ], install : true) -spa_json_dump_exe = executable('spa-json-dump', 'spa-json-dump.c', - dependencies : [ spa_dep, dl_lib, ], +spa_json_dump = executable('spa-json-dump', 'spa-json-dump.c', + dependencies : [ spa_dep ], install : true) + +spa_json_dump_exe = executable('spa-json-dump-native', 'spa-json-dump.c', + dependencies : [ spa_inc_dep ], + native : true) + +meson.override_find_program('spa-json-dump', spa_json_dump_exe)