summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-05-24 19:35:24 -0700
committerKhem Raj <raj.khem@gmail.com>2023-05-25 08:56:32 -0700
commitee2f57c7c3b489ddaab3343b9501f6257c65dcee (patch)
tree13a84521424a851201a6142b7b85e9aab697a0f1
parent3f5c02b1d64f302babbd104bcfd993281db0a3c6 (diff)
downloadmeta-openembedded-ee2f57c7c3b489ddaab3343b9501f6257c65dcee.tar.gz
cgdb: Fix buildpaths emitted into cgdb binary
Do not add builddir to search paths for cgdb.txt Fixes WARNING: cgdb-0.8.0-r0 do_package_qa: QA Issue: File /usr/bin/cgdb in package cgdb contains reference to TMPDIR [buildpaths] Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch34
-rw-r--r--meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb3
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch b/meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch
new file mode 100644
index 0000000000..989df8ed92
--- /dev/null
+++ b/meta-oe/recipes-devtools/cgdb/cgdb/0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch
@@ -0,0 +1,34 @@
1From be56e955a32e5e9da0be32008afb8a8ee60e9b56 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 24 May 2023 19:31:23 -0700
4Subject: [PATCH] cgdb: Do not search for cgdb.txt in build dir
5
6If we do cross builds it encodes the build time workdir here and it wont
7be useful to look into this dir since cross-built cgdb may not run on
8build host and build workdir will not exist on target
9
10Upstream-Status: Inappropriate [Cross-compile specific]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 cgdb/interface.cpp | 5 -----
14 1 file changed, 5 deletions(-)
15
16diff --git a/cgdb/interface.cpp b/cgdb/interface.cpp
17index dc58137..d3aab5e 100644
18--- a/cgdb/interface.cpp
19+++ b/cgdb/interface.cpp
20@@ -1568,11 +1568,6 @@ void if_display_help(void)
21
22 fs_util_get_path(PKGDATADIR, "cgdb.txt", cgdb_help_file);
23
24- /* File doesn't exist. Try to find cgdb.txt in the build dir in case
25- * the user is running a built cgdb binary directly. */
26- if (!fs_verify_file_exists(cgdb_help_file))
27- fs_util_get_path(TOPBUILDDIR, "doc/cgdb.txt", cgdb_help_file);
28-
29 ret_val = source_set_exec_line(src_viewer, cgdb_help_file, 1, 0);
30
31 if (ret_val == 0)
32--
332.40.1
34
diff --git a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb
index c5a0030823..922dfc7763 100644
--- a/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb
+++ b/meta-oe/recipes-devtools/cgdb/cgdb_0.8.0.bb
@@ -9,7 +9,8 @@ DEPENDS = "flex-native readline ncurses"
9 9
10inherit autotools texinfo 10inherit autotools texinfo
11 11
12SRC_URI = "http://cgdb.me/files/${BP}.tar.gz" 12SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \
13 file://0001-cgdb-Do-not-search-for-cgdb.txt-in-build-dir.patch"
13SRC_URI[sha256sum] = "0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1" 14SRC_URI[sha256sum] = "0d38b524d377257b106bad6d856d8ae3304140e1ee24085343e6ddf1b65811f1"
14 15
15CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes" 16CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes"