From bed95b22c3433d8477f6883dac471c27fcad9307 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 9 Jun 2015 13:41:40 -0700 Subject: buildgcc: Update and fix GDB GDB stopped building ever since we updated from version 7.6 but nobody noticed ;) Update from 7.9 to 7.9.1 and bring the required patches forward. Change-Id: I2f357525a46d5540e9f57b80d830943bbd5dfcaf Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/10494 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- util/crossgcc/buildgcc | 6 +++--- util/crossgcc/patches/gdb-7.6_no-texinfo.patch | 14 -------------- util/crossgcc/patches/gdb-7.6_pythonhome.patch | 19 ------------------- util/crossgcc/patches/gdb-7.9.1_no-doc.patch | 12 ++++++++++++ util/crossgcc/patches/gdb-7.9.1_pythonhome.patch | 19 +++++++++++++++++++ util/crossgcc/sum/Python-3.4.3.tar.xz.cksum | 1 + util/crossgcc/sum/expat-2.1.0.tar.gz.cksum | 1 + util/crossgcc/sum/gdb-7.9.1.tar.xz.cksum | 1 + 8 files changed, 37 insertions(+), 36 deletions(-) delete mode 100644 util/crossgcc/patches/gdb-7.6_no-texinfo.patch delete mode 100644 util/crossgcc/patches/gdb-7.6_pythonhome.patch create mode 100644 util/crossgcc/patches/gdb-7.9.1_no-doc.patch create mode 100644 util/crossgcc/patches/gdb-7.9.1_pythonhome.patch create mode 100644 util/crossgcc/sum/Python-3.4.3.tar.xz.cksum create mode 100644 util/crossgcc/sum/expat-2.1.0.tar.gz.cksum create mode 100644 util/crossgcc/sum/gdb-7.9.1.tar.xz.cksum (limited to 'util/crossgcc') diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 83b9d822f7..77f22489f9 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -22,8 +22,8 @@ cd $(dirname $0) -CROSSGCC_DATE="June 4th, 2015" -CROSSGCC_VERSION="1.29" +CROSSGCC_DATE="June 9th, 2015" +CROSSGCC_VERSION="1.30" # default settings TARGETDIR=$(pwd)/xgcc @@ -38,7 +38,7 @@ LIBELF_VERSION=0.8.13 GCC_VERSION=4.9.2 GCC_AUTOCONF_VERSION=2.69 BINUTILS_VERSION=2.25 -GDB_VERSION=7.9 +GDB_VERSION=7.9.1 IASL_VERSION=20150204 PYTHON_VERSION=3.4.3 EXPAT_VERSION=2.1.0 diff --git a/util/crossgcc/patches/gdb-7.6_no-texinfo.patch b/util/crossgcc/patches/gdb-7.6_no-texinfo.patch deleted file mode 100644 index ac9241c921..0000000000 --- a/util/crossgcc/patches/gdb-7.6_no-texinfo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur gdb-7.6.orig/missing gdb-7.6/missing ---- gdb-7.6.orig/missing 2009-08-22 04:48:33.000000000 -0700 -+++ gdb-7.6/missing 2013-07-10 13:10:32.940902728 -0700 -@@ -314,8 +314,8 @@ - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. -- test -f $file || exit 1 -- touch $file -+ #test -f $file || exit 1 -+ #touch $file - ;; - - tar*) diff --git a/util/crossgcc/patches/gdb-7.6_pythonhome.patch b/util/crossgcc/patches/gdb-7.6_pythonhome.patch deleted file mode 100644 index dfca5dd03a..0000000000 --- a/util/crossgcc/patches/gdb-7.6_pythonhome.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ur gdb-7.6/gdb/python/python.c gdb-7.6.patched/gdb/python/python.c ---- gdb-7.6/gdb/python/python.c 2012-06-25 18:53:20.000000000 +0200 -+++ gdb-7.6.patched/gdb/python/python.c 2012-10-24 15:28:37.422047.69 +0200 -@@ -1227,6 +1227,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.9.1_no-doc.patch b/util/crossgcc/patches/gdb-7.9.1_no-doc.patch new file mode 100644 index 0000000000..156337a0a3 --- /dev/null +++ b/util/crossgcc/patches/gdb-7.9.1_no-doc.patch @@ -0,0 +1,12 @@ +diff -ur gdb-7.9.1/gdb/Makefile.in gdb-7.9.1/gdb/Makefile.in +--- gdb-7.9.1/gdb/Makefile.in 2015-05-13 10:36:05.000000000 -0700 ++++ gdb-7.9.1/gdb/Makefile.in 2015-06-09 13:22:53.594505278 -0700 +@@ -1065,7 +1065,7 @@ + + TSOBS = inflow.o + +-SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR) ++SUBDIRS = @subdirs@ data-directory $(GNULIB_BUILDDIR) + CLEANDIRS = $(SUBDIRS) + + # List of subdirectories in the build tree that must exist. diff --git a/util/crossgcc/patches/gdb-7.9.1_pythonhome.patch b/util/crossgcc/patches/gdb-7.9.1_pythonhome.patch new file mode 100644 index 0000000000..7e34c7afa6 --- /dev/null +++ b/util/crossgcc/patches/gdb-7.9.1_pythonhome.patch @@ -0,0 +1,19 @@ +diff -ur gdb-7.9.1/gdb/python/python.c gdb-7.9.1.patched/gdb/python/python.c +--- gdb-7.9.1/gdb/python/python.c 2015-05-13 10:36:05.000000000 -0700 ++++ gdb-7.9.1.patched/gdb/python/python.c 2015-06-09 13:13:24.824178760 -0700 +@@ -1681,6 +1681,15 @@ + #endif + #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/sum/Python-3.4.3.tar.xz.cksum b/util/crossgcc/sum/Python-3.4.3.tar.xz.cksum new file mode 100644 index 0000000000..7f7273e4d8 --- /dev/null +++ b/util/crossgcc/sum/Python-3.4.3.tar.xz.cksum @@ -0,0 +1 @@ +7ca5cd664598bea96eec105aa6453223bb6b4456 tarballs/Python-3.4.3.tar.xz diff --git a/util/crossgcc/sum/expat-2.1.0.tar.gz.cksum b/util/crossgcc/sum/expat-2.1.0.tar.gz.cksum new file mode 100644 index 0000000000..23ee87a363 --- /dev/null +++ b/util/crossgcc/sum/expat-2.1.0.tar.gz.cksum @@ -0,0 +1 @@ +b08197d146930a5543a7b99e871cba3da614f6f0 tarballs/expat-2.1.0.tar.gz diff --git a/util/crossgcc/sum/gdb-7.9.1.tar.xz.cksum b/util/crossgcc/sum/gdb-7.9.1.tar.xz.cksum new file mode 100644 index 0000000000..c926408728 --- /dev/null +++ b/util/crossgcc/sum/gdb-7.9.1.tar.xz.cksum @@ -0,0 +1 @@ +04ba2906279b16b5f99c4f6b25942843a3717cdb tarballs/gdb-7.9.1.tar.xz -- cgit v1.2.3