summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2013-05-09 15:58:09 +0300
committerSamuli Piippo <samuli.piippo@digia.com>2013-05-21 16:05:05 +0300
commit0b48d598275f132a3e7ffe65849af8f46449df4c (patch)
tree49daed9c62602d2be4373e04cdc5c84d2cc8e9d2
parent368afd53358f6dbe4196c437be557161e1f27543 (diff)
downloadmeta-boot2qt-0b48d598275f132a3e7ffe65849af8f46449df4c.tar.gz
gdb: fix gdb's dependency to PYTHONHOME env
gdb was unable to locate python without using PYTHONHOME environment variable. Change-Id: I5fe5d37ab88a0d186f91dbedcab1a480869da311 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
-rw-r--r--recipes/gdb/files/0001-help-python-find-itself-correctly.patch30
-rw-r--r--recipes/gdb/gdb-cross-canadian_7.5.1.bbappend4
2 files changed, 34 insertions, 0 deletions
diff --git a/recipes/gdb/files/0001-help-python-find-itself-correctly.patch b/recipes/gdb/files/0001-help-python-find-itself-correctly.patch
new file mode 100644
index 0000000..c836507
--- /dev/null
+++ b/recipes/gdb/files/0001-help-python-find-itself-correctly.patch
@@ -0,0 +1,30 @@
1From d7496f873617892ce82b200c3acdf3d87141d06c Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Thu, 9 May 2013 15:46:15 +0300
4Subject: [PATCH] help python find itself correctly
5
6The WITH_PYTHON_PATH python path does not work with relocatable
7SDK. Instead use program name since it's bound to be in correct place.
8---
9 gdb/main.c | 5 +----
10 1 file changed, 1 insertion(+), 4 deletions(-)
11
12diff --git a/gdb/main.c b/gdb/main.c
13index 976f8ae..aa1913d 100644
14--- a/gdb/main.c
15+++ b/gdb/main.c
16@@ -369,10 +369,7 @@ captured_main (void *data)
17 #ifdef WITH_PYTHON_PATH
18 {
19 /* For later use in helping Python find itself. */
20- char *tmp = concat (WITH_PYTHON_PATH, SLASH_STRING, "lib", NULL);
21-
22- python_libdir = relocate_gdb_directory (tmp, PYTHON_PATH_RELOCATABLE);
23- xfree (tmp);
24+ python_libdir = gdb_program_name;
25 }
26 #endif
27
28--
291.7.10.4
30
diff --git a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend b/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend
new file mode 100644
index 0000000..6f08842
--- /dev/null
+++ b/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend
@@ -0,0 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
2
3SRC_URI += "file://0001-help-python-find-itself-correctly.patch"
4