]> Git Repo - buildroot-mgba.git/blame - package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch
package/ruby: disable unsupported yjit
[buildroot-mgba.git] / package / rygel / 0002-meson.build-fix-g_ir_compiler-calls.patch
CommitLineData
94515b90
FF
1From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <[email protected]>
3Date: Tue, 15 Mar 2022 19:20:33 +0100
4Subject: [PATCH] meson.build: fix g_ir_compiler calls
5
6Fix the following build failure when cross-compiling which is raised
7because rygel is using a custom_target target instead of the standard
8gnome.generate_gir:
9
10[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command
11FAILED: src/librygel-core/RygelCore-2.6.typelib
12/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir
13Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir
14error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2
15
16Indeed, the custom_target command is unable to retrieve the correct
17--includedir from glib-2.0.pc so add an ugly hack to custom_target calls
18
19Fixes:
20 - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d
21
22Signed-off-by: Fabrice Fontaine <[email protected]>
23[Upstream status: probably not upstreamable]
24---
25 src/librygel-core/meson.build | 4 +++-
26 src/librygel-renderer-gst/meson.build | 1 +
27 src/librygel-renderer/meson.build | 1 +
28 src/librygel-server/meson.build | 1 +
29 4 files changed, 6 insertions(+), 1 deletion(-)
30
31diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build
32index fd43bebe..e6be2b5e 100644
33--- a/src/librygel-core/meson.build
34+++ b/src/librygel-core/meson.build
35@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir',
36 # so we depend on the custom_target from that step and pass the input through
37 # commandline.
38 custom_target('RygelCore-2.6.typelib',
39- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')],
40+ command: [g_ir_compiler, '--output', '@OUTPUT@',
41+ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir,
42+ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')],
43 output: 'RygelCore-2.6.typelib',
44 depends: [ core_lib, core_gir ],
45 install: true,
46diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build
47index ad98a3a7..e8baefe1 100644
48--- a/src/librygel-renderer-gst/meson.build
49+++ b/src/librygel-renderer-gst/meson.build
50@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib',
51 '--output', '@OUTPUT@',
52 '--includedir', core_girdir,
53 '--includedir', renderer_girdir,
54+ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir,
55 join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')],
56 output: 'RygelRendererGst-2.6.typelib',
57 depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir],
58diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build
59index 5f401527..821273ff 100644
60--- a/src/librygel-renderer/meson.build
61+++ b/src/librygel-renderer/meson.build
62@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib',
63 command: [g_ir_compiler,
64 '--output', '@OUTPUT@',
65 '--includedir', core_girdir,
66+ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir,
67 join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')],
68 output: 'RygelRenderer-2.6.typelib',
69 depends: [ renderer_lib, renderer_gir, core_gir ],
70diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build
71index a3bd77d9..6b084eb6 100644
72--- a/src/librygel-server/meson.build
73+++ b/src/librygel-server/meson.build
74@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib',
75 command: [g_ir_compiler,
76 '--output', '@OUTPUT@',
77 '--includedir', core_girdir,
78+ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir,
79 join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')],
80 output: 'RygelServer-2.6.typelib',
81 depends: [ server_lib, server_gir, core_gir ],
82--
832.35.1
84
This page took 2.164672 seconds and 4 git commands to generate.