Date: Friday, September 10, 2010 @ 10:46:28 Author: allan Revision: 90307
upgpkg: gdb 7.2-1 upstream update Modified: gdb/trunk/PKGBUILD Deleted: gdb/trunk/gdb-python-2.7.patch gdb/trunk/tui-no-gdbarch.patch ----------------------+ PKGBUILD | 28 +++++++++---------------- gdb-python-2.7.patch | 27 ------------------------ tui-no-gdbarch.patch | 54 ------------------------------------------------- 3 files changed, 10 insertions(+), 99 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-09-10 14:44:04 UTC (rev 90306) +++ PKGBUILD 2010-09-10 14:46:28 UTC (rev 90307) @@ -3,8 +3,8 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=gdb -pkgver=7.1 -pkgrel=3 +pkgver=7.2 +pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gdb/"; @@ -14,27 +14,19 @@ backup=('etc/gdb/gdbinit') options=('!libtool') install=gdb.install -source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2 - tui-no-gdbarch.patch - gdb-python-2.7.patch) -md5sums=('21dce610476c054687b52770d2ddc657' - 'e2f3f6cb11d72e3727ed4f7c49ea395f' - 'eae41a42d44edaf8bfd464e5b227583e') +source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2) +md5sums=('64260e6c56979ee750a01055f16091a5') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i $srcdir/tui-no-gdbarch.patch - # python-2.7 compatibility - patch -Np1 -i $srcdir/gdb-python-2.7.patch - - # ppl-0.11 compatibility - sed -i "/ppl_minor_version=/s#10#11#" configure - ./configure --prefix=/usr --disable-nls \ --with-system-readline \ --with-system-gdbinit=/etc/gdb/gdbinit make + + # requires dejagnu + #make check } package() { @@ -46,7 +38,7 @@ touch $pkgdir/etc/gdb/gdbinit # resolve conflicts with binutils - rm -f ${pkgdir}/usr/include/{bfd,dis-asm,symcat,ansidecl,bfdlink}.h - rm -f ${pkgdir}/usr/lib/{libiberty,libbfd,libopcodes}.a - rm -f ${pkgdir}/usr/share/info/{bfd.info,configure.info,standards.info} + rm ${pkgdir}/usr/include/{ansidecl,bfd,bfdlink,dis-asm,symcat}.h + rm ${pkgdir}/usr/lib/{libbfd,libiberty,libopcodes}.a + rm ${pkgdir}/usr/share/info/{bfd,configure,standards}.info } Deleted: gdb-python-2.7.patch =================================================================== --- gdb-python-2.7.patch 2010-09-10 14:44:04 UTC (rev 90306) +++ gdb-python-2.7.patch 2010-09-10 14:46:28 UTC (rev 90307) @@ -1,27 +0,0 @@ ---- gdb-7.0/gdb/configure.ac~ 2010-07-08 14:54:43.770583270 +0200 -+++ gdb-7.0/gdb/configure.ac 2010-07-08 14:56:17.539947910 +0200 -@@ -881,6 +881,12 @@ - LIBS="$LIBS ${python_libs}" - have_libpython=no - if test "${have_libpython}" = no; then -+ AC_TRY_LIBPYTHON(python2.7, have_libpython) -+ if test "${HAVE_LIBPYTHON2_7}" = yes; then -+ AC_DEFINE(HAVE_LIBPYTHON2_7, 1, [Define if Python 2.7 is being used.]) -+ fi -+ fi -+ if test "${have_libpython}" = no; then - AC_TRY_LIBPYTHON(python2.6, have_libpython) - if test "${HAVE_LIBPYTHON2_6}" = yes; then - AC_DEFINE(HAVE_LIBPYTHON2_6, 1, [Define if Python 2.6 is being used.]) ---- gdb-7.0/gdb/python/python-internal.h~ 2010-07-08 14:54:43.136858331 +0200 -+++ gdb-7.0/gdb/python/python-internal.h 2010-07-08 14:56:56.739736159 +0200 -@@ -45,6 +45,9 @@ - #elif HAVE_LIBPYTHON2_6 - #include "python2.6/Python.h" - #include "python2.6/frameobject.h" -+#elif HAVE_LIBPYTHON2_7 -+#include "python2.7/Python.h" -+#include "python2.7/frameobject.h" - #else - #error "Unable to find usable Python.h" - #endif Deleted: tui-no-gdbarch.patch =================================================================== --- tui-no-gdbarch.patch 2010-09-10 14:44:04 UTC (rev 90306) +++ tui-no-gdbarch.patch 2010-09-10 14:46:28 UTC (rev 90307) @@ -1,54 +0,0 @@ -2010-03-20 Daniel Jacobowitz <[email protected]> - - * tui/tui-disasm.c (tui_get_begin_asm_address): Default to - get_current_arch. - * tui/tui-layout.c (extract_display_start_addr): Likewise. - -Index: src/gdb/tui/tui-disasm.c -=================================================================== -RCS file: /cvs/src/src/gdb/tui/tui-disasm.c,v -retrieving revision 1.33 -diff -u -p -r1.33 tui-disasm.c ---- src/gdb/tui/tui-disasm.c 1 Jan 2010 07:32:07 -0000 1.33 -+++ src/gdb/tui/tui-disasm.c 20 Mar 2010 04:17:05 -0000 -@@ -21,6 +21,7 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - #include "defs.h" -+#include "arch-utils.h" - #include "symtab.h" - #include "breakpoint.h" - #include "frame.h" -@@ -330,7 +331,7 @@ tui_get_begin_asm_address (struct gdbarc - { - struct tui_gen_win_info *locator; - struct tui_locator_element *element; -- struct gdbarch *gdbarch = NULL; -+ struct gdbarch *gdbarch = get_current_arch (); - CORE_ADDR addr; - - locator = tui_locator_win_info_ptr (); -Index: src/gdb/tui/tui-layout.c -=================================================================== -RCS file: /cvs/src/src/gdb/tui/tui-layout.c,v -retrieving revision 1.36 -diff -u -p -r1.36 tui-layout.c ---- src/gdb/tui/tui-layout.c 1 Jan 2010 07:32:07 -0000 1.36 -+++ src/gdb/tui/tui-layout.c 20 Mar 2010 04:17:05 -0000 -@@ -21,6 +21,7 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - #include "defs.h" -+#include "arch-utils.h" - #include "command.h" - #include "symtab.h" - #include "frame.h" -@@ -522,7 +523,7 @@ static void - extract_display_start_addr (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p) - { - enum tui_layout_type cur_layout = tui_current_layout (); -- struct gdbarch *gdbarch = NULL; -+ struct gdbarch *gdbarch = get_current_arch (); - CORE_ADDR addr; - CORE_ADDR pc; - struct symtab_and_line cursal = get_current_source_symtab_and_line ();
