blob: 2f09c3299761260d037578fa176b87271af1500c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
From 790177e2a89aa0710b570d595223bdb511241c56 Mon Sep 17 00:00:00 2001
From: Gyorgy Sarvari <skandigraun@gmail.com>
Date: Tue, 11 Feb 2025 13:39:54 +0100
Subject: [PATCH] Don't use system sysprof dbus folder
In case Mutter is built with profiler support, it requires
org.gnome.Sysprof3.Profiler.xml file to be available - however
the meson build file is trying to access it on the build machine's
system ($datadir/dbus-1/interfaces) instead of searching for it
in the $RECIPE_SYSROOT.
To ensure that it looks for this file in the correct folder, prefix
the search path with the value of the sys_root property, which is set
in the meson.cross file (by meson.bbclass).
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Upstream-Status: Inappropriate [oe-specific: only related to cross-compiling]
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 551cb23..5199be6 100644
--- a/meson.build
+++ b/meson.build
@@ -446,7 +446,7 @@ if have_profiler
if libsysprof_capture_dep.type_name() == 'pkgconfig'
sysprof_dep = dependency('sysprof-6', 'sysprof-4')
- sysprof_dbus_interfaces_dir = sysprof_dep.get_variable('datadir') / 'dbus-1' / 'interfaces'
+ sysprof_dbus_interfaces_dir = meson.get_external_property('sys_root') + sysprof_dep.get_variable('datadir') / 'dbus-1' / 'interfaces'
else
sysprof_dbus_interfaces_dir = mutter_srcdir / 'subprojects' / 'sysprof' / 'src'
endif
|
