summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-08-14 21:41:13 -0700
committerArmin Kuster <akuster@mvista.com>2025-04-16 20:30:23 -0400
commit829fa434c3b9c1b896c4dd079e07c4b4db0d385f (patch)
treea83ab4ba748223d6208f57c002d3ea87b5f6e1bf
parent57b939762c919e160505deba8f9deef349e85144 (diff)
downloadmeta-openembedded-829fa434c3b9c1b896c4dd079e07c4b4db0d385f.tar.gz
blueman: Fix buildpathe issue with cython generated code
Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Markus Volk <f_l_k@t-online.de> Signed-off-by: Armin Kuster <akuster@mvista.com>
-rw-r--r--meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch38
-rw-r--r--meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb1
2 files changed, 39 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch
new file mode 100644
index 0000000000..10f89a124c
--- /dev/null
+++ b/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch
@@ -0,0 +1,38 @@
1From 18af739fd96960bbc8c5db5dd290d2f9134cd347 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 14 Aug 2024 21:26:24 -0700
4Subject: [PATCH] meson: DO not emit absolute path when S != B
5
6build systems like OE build outside sourcetree in such cases it works
7ok but cython resolves the input file to absolute path and that gets
8emitted into genetate _blueman.c as module name, renders the build
9non-reproducible, wish cython had a better way to handle this but there
10is not, therefore tweak the meson build rule to account for specifying
11workdir to cython which will search the inputs correctly, and use
12meson's build_root to emit the output into build dir. This ensures that
13it becomes independent of source or build directories and cython does
14not generate the absolute paths into generate C code.
15
16See cython discussion on [1]
17
18[1] https://github.com/cython/cython/issues/5949
19
20Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/2461]
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22---
23 module/meson.build | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/module/meson.build b/module/meson.build
27index 096ad7c8..e3d96f17 100644
28--- a/module/meson.build
29+++ b/module/meson.build
30@@ -4,7 +4,7 @@ blueman_c = custom_target(
31 'blueman_c',
32 output: '_blueman.c',
33 input: '_blueman.pyx',
34- command: [cython, '--output-file', '@OUTPUT@', '@INPUT@'])
35+ command: [cython, '-w', meson.source_root(), '--output-file', meson.build_root() + '/' + '@OUTPUT@', '@INPUT@'])
36
37 sources = [
38 blueman_c,
diff --git a/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb b/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb
index 0374d23f0c..4174da721d 100644
--- a/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb
+++ b/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb
@@ -13,6 +13,7 @@ SRC_URI = " \
13 file://0001-Search-for-cython3.patch \ 13 file://0001-Search-for-cython3.patch \
14 file://0002-fix-fail-to-enable-bluetooth.patch \ 14 file://0002-fix-fail-to-enable-bluetooth.patch \
15 file://0001-meson-add-pythoninstalldir-option.patch \ 15 file://0001-meson-add-pythoninstalldir-option.patch \
16 file://0001-meson-DO-not-emit-absolute-path-when-S-B.patch \
16" 17"
17S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
18SRCREV = "c85e7afb8d6547d4c35b7b639124de8e999c3650" 19SRCREV = "c85e7afb8d6547d4c35b7b639124de8e999c3650"