From 70e9a6f9780b23c9ab0ff7703fb42a0286f2f5aa Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Thu, 6 Feb 2014 16:06:41 +0100 Subject: [PATCH] gdb: update to 7.7. --- .../patches/gdb-76-linux-low-threaddb.patch | 32 ----------------- srcpkgs/gdb/patches/gdb-threaddb.patch | 36 ------------------- srcpkgs/gdb/template | 6 ++-- 3 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 srcpkgs/gdb/patches/gdb-76-linux-low-threaddb.patch delete mode 100644 srcpkgs/gdb/patches/gdb-threaddb.patch diff --git a/srcpkgs/gdb/patches/gdb-76-linux-low-threaddb.patch b/srcpkgs/gdb/patches/gdb-76-linux-low-threaddb.patch deleted file mode 100644 index eb5bb744f7..0000000000 --- a/srcpkgs/gdb/patches/gdb-76-linux-low-threaddb.patch +++ /dev/null @@ -1,32 +0,0 @@ -this patch fixes compilation of gdbserver on systems that don't have -thread_db.h. in that case we fall back to gdb's own copy -"gdb_thread_db.h", so the typedef of the td_thrhandle_t member is -available, which is accessed in other parts of the code without -checking whether thread_db.h is available. -this is by far the cleaner solution, removing the accesses to the -th member in other parts of the source would either litter it with -ifdefs or cripple the functionality. - ---- gdb-7.6.2.org/gdb/gdbserver/linux-low.h -+++ gdb-7.6.2/gdb/gdbserver/linux-low.h -@@ -18,6 +18,8 @@ - - #ifdef HAVE_THREAD_DB_H - #include <thread_db.h> -+#else -+#include "gdb_thread_db.h" - #endif - #include <signal.h> - -@@ -270,11 +272,9 @@ - int need_step_over; - - int thread_known; --#ifdef HAVE_THREAD_DB_H - /* The thread handle, used for e.g. TLS access. Only valid if - THREAD_KNOWN is set. */ - td_thrhandle_t th; --#endif - - /* Arch-specific additions. */ - struct arch_lwp_info *arch_private; diff --git a/srcpkgs/gdb/patches/gdb-threaddb.patch b/srcpkgs/gdb/patches/gdb-threaddb.patch deleted file mode 100644 index 2a2285ac8b..0000000000 --- a/srcpkgs/gdb/patches/gdb-threaddb.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- gdb-7.4.org/gdb/common/gdb_thread_db.h -+++ gdb-7.4/gdb/common/gdb_thread_db.h -@@ -1,17 +1,5 @@ - #ifdef HAVE_THREAD_DB_H - #include <thread_db.h> -- --#ifndef LIBTHREAD_DB_SO --#define LIBTHREAD_DB_SO "libthread_db.so.1" --#endif -- --#ifndef LIBTHREAD_DB_SEARCH_PATH --/* $sdir appears before $pdir for some minimal security protection: -- we trust the system libthread_db.so a bit more than some random -- libthread_db associated with whatever libpthread the app is using. */ --#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir" --#endif -- - #else - - /* Copyright (C) 1999-2000, 2007-2012 Free Software Foundation, Inc. -@@ -453,3 +441,15 @@ - #endif /* thread_db.h */ - - #endif /* HAVE_THREAD_DB_H */ -+ -+#ifndef LIBTHREAD_DB_SO -+#define LIBTHREAD_DB_SO "libthread_db.so.1" -+#endif -+ -+#ifndef LIBTHREAD_DB_SEARCH_PATH -+/* $sdir appears before $pdir for some minimal security protection: -+ we trust the system libthread_db.so a bit more than some random -+ libthread_db associated with whatever libpthread the app is using. */ -+#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir" -+#endif -+ diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template index 23ad8a2294..841575f13b 100644 --- a/srcpkgs/gdb/template +++ b/srcpkgs/gdb/template @@ -1,7 +1,7 @@ # Template file for 'gdb' pkgname=gdb -version=7.6.2 -revision=2 +version=7.7 +revision=1 patch_args="-Np1" build_style=gnu-configure configure_args="--disable-werror --disable-nls --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit" @@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@gmail.com>" homepage="http://www.gnu.org/software/gdb/" license="GPL-3" distfiles="http://ftp.gnu.org/gnu/gdb/gdb-$version.tar.bz2" -checksum=2f6a0e2ce1c66c9dedeb7f58a8d1298ad602ddcdaf15d23104e1f7832b96d0e8 +checksum=0404d1c6ee6b3ddd811722b5197944758d37b4591c216030effbac204f5a6c23 # Package build options build_options="gdbserver static"