diff mbox series

[meta-gnome,2/7] tracker: Point TOP_SRCDIR to target path

Message ID 20230526061925.420351-2-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,1/7] libgphoto2: Edit out sysroot from CC variable in configure | expand

Commit Message

Khem Raj May 26, 2023, 6:19 a.m. UTC 
source_root uses absolute path to build time srcdir
which results in buildpath errors

Fixes
File /usr/bin/tracker3 in package tracker contains reference to TMPDIR [buildpaths]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-meson-Do-not-define-TOP_SRCDIR.patch | 24 +++++++++++++++++++
 .../recipes-gnome/tracker/tracker_3.5.1.bb    |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/tracker/tracker/0001-meson-Do-not-define-TOP_SRCDIR.patch
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/tracker/tracker/0001-meson-Do-not-define-TOP_SRCDIR.patch b/meta-gnome/recipes-gnome/tracker/tracker/0001-meson-Do-not-define-TOP_SRCDIR.patch
new file mode 100644
index 0000000000..5c6ab71a9f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/tracker/tracker/0001-meson-Do-not-define-TOP_SRCDIR.patch
@@ -0,0 +1,24 @@ 
+From 3e262192ffebf5d6fec92d5b7ba08348a94df1ae Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 25 May 2023 20:54:47 -0700
+Subject: [PATCH] meson: Do not define TOP_SRCDIR
+
+This is passed from build env
+
+Upstream-Status: Inappropriate [Cross compile specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/meson.build
++++ b/meson.build
+@@ -353,7 +353,7 @@ subdir('utils')
+ 
+ test_c_args = tracker_c_args + [
+     '-DTOP_BUILDDIR="@0@"'.format(build_root),
+-    '-DTOP_SRCDIR="@0@"'.format(source_root),
++    '-DTOP_SRCDIR="@0@"'.format('/usr/src/debug/tracker'),
+ ]
+ 
+ tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker')
diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.5.1.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.5.1.bb
index 8489043924..6dd8af2390 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker_3.5.1.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker_3.5.1.bb
@@ -22,6 +22,7 @@  GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check python3native
 
+SRC_URI += "file://0001-meson-Do-not-define-TOP_SRCDIR.patch"
 SRC_URI[archive.sha256sum] = "f972d50ac7bafdccf113b1eb99dcae35404685a99e55bfef16f3ac83b4de974d"
 
 # gobject-introspection is mandatory and cannot be configured