From 79b0574698f34abbb4a7924d4e40ea2b2b2cecf3 Mon Sep 17 00:00:00 2001 From: zbao Date: Tue, 21 Aug 2012 16:25:41 +0800 Subject: crossgcc: Update GDB patch version to 7.4.1 libgen.h dont have to be included. Change-Id: I46a6a23a310b20784de956a577f1ab3c7931e34d Signed-off-by: Zheng Bao Signed-off-by: zbao Reviewed-on: http://review.coreboot.org/1470 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- util/crossgcc/patches/gdb-7.3.1_pythonhome.patch | 27 ------------------------ util/crossgcc/patches/gdb-7.4.1_pythonhome.patch | 19 +++++++++++++++++ 2 files changed, 19 insertions(+), 27 deletions(-) delete mode 100644 util/crossgcc/patches/gdb-7.3.1_pythonhome.patch create mode 100644 util/crossgcc/patches/gdb-7.4.1_pythonhome.patch (limited to 'util') diff --git a/util/crossgcc/patches/gdb-7.3.1_pythonhome.patch b/util/crossgcc/patches/gdb-7.3.1_pythonhome.patch deleted file mode 100644 index 90da2d9d6f..0000000000 --- a/util/crossgcc/patches/gdb-7.3.1_pythonhome.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur gdb-7.3.1.orig/gdb/python/python.c gdb-7.3.1/gdb/python/python.c ---- gdb-7.3.1.orig/gdb/python/python.c 2011-07-02 21:33:10.000000000 +0200 -+++ gdb-7.3.1/gdb/python/python.c 2011-11-01 21:07:25.000000000 +0100 -@@ -33,6 +33,7 @@ - #include "python.h" - - #include -+#include - - /* True if we should print the stack when catching a Python error, - false otherwise. */ -@@ -1010,6 +1011,15 @@ - SLASH_STRING, "python", NULL)); - #endif - -+ char readlinkbuffer[BUFSIZ]; -+ int readlinks = readlink("/proc/self/exe", readlinkbuffer, BUFSIZ - 1); -+ readlinkbuffer[readlinks] = 0; -+ char *executeablepath = dirname(readlinkbuffer); -+ char *pythonhome = malloc(strlen(executeablepath) + strlen("/../") + 2); -+ strcpy(pythonhome, executeablepath); -+ strcat(pythonhome, "/../"); -+ setenv("PYTHONHOME", pythonhome, 1); -+ - Py_Initialize (); - PyEval_InitThreads (); - diff --git a/util/crossgcc/patches/gdb-7.4.1_pythonhome.patch b/util/crossgcc/patches/gdb-7.4.1_pythonhome.patch new file mode 100644 index 0000000000..9bab2e022c --- /dev/null +++ b/util/crossgcc/patches/gdb-7.4.1_pythonhome.patch @@ -0,0 +1,19 @@ +diff -ur gdb-7.4.1.orig/gdb/python/python.c gdb-7.4.1/gdb/python/python.c +--- gdb-7.4.1.orig/gdb/python/python.c 2012-01-15 02:04:05.000000000 +0800 ++++ gdb-7.4.1/gdb/python/python.c 2012-08-21 15:11:32.000000000 +0800 +@@ -1273,6 +1273,15 @@ + SLASH_STRING, "python", NULL)); + #endif + ++ char readlinkbuffer[BUFSIZ]; ++ int readlinks = readlink("/proc/self/exe", readlinkbuffer, BUFSIZ - 1); ++ readlinkbuffer[readlinks] = 0; ++ char *executeablepath = dirname(readlinkbuffer); ++ char *pythonhome = malloc(strlen(executeablepath) + strlen("/../") + 2); ++ strcpy(pythonhome, executeablepath); ++ strcat(pythonhome, "/../"); ++ setenv("PYTHONHOME", pythonhome, 1); ++ + Py_Initialize (); + PyEval_InitThreads (); + -- cgit v1.2.3