From dc2119d1e1a5218d4511571707a11b9a9c67ac6d Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 7 Sep 2010 13:13:18 +0200 Subject: [PATCH] gdb: Updated (6.6 -> 7.2) --- develop/gdb/gdb.conf | 8 +-- develop/gdb/gdb.desc | 7 +- develop/gdb/installed-by-binutils.patch | 91 ------------------------- develop/gdb/parallel-make-ppc.patch | 31 --------- develop/gdb/shared_docs.patch | 47 +++++++++++++ 5 files changed, 52 insertions(+), 132 deletions(-) delete mode 100644 develop/gdb/installed-by-binutils.patch delete mode 100644 develop/gdb/parallel-make-ppc.patch create mode 100644 develop/gdb/shared_docs.patch diff --git a/develop/gdb/gdb.conf b/develop/gdb/gdb.conf index 0bd434ddb..a64dcb0ca 100644 --- a/develop/gdb/gdb.conf +++ b/develop/gdb/gdb.conf @@ -2,8 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../gdb/gdb.conf -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf +# Copyright (C) 2010 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -13,7 +12,4 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -var_remove confopt " " "--enable-shared" -var_remove confopt " " "--disable-static" -hook_add inmake 5 "eval $MAKE -C gdb/doc install-info" - +var_append extraconfopt ' ' '--with-expat=no' diff --git a/develop/gdb/gdb.desc b/develop/gdb/gdb.desc index d5c17d738..c66f60337 100644 --- a/develop/gdb/gdb.desc +++ b/develop/gdb/gdb.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../gdb/gdb.desc -[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -31,8 +31,7 @@ [L] GPL [S] Stable -[V] 6.6 +[V] 7.2 [P] X -?-3-----9 500.500 -[D] 1691745159 gdb-6.6.tar.bz2 ftp://sources.redhat.com/pub/gdb/releases/ - +[D] 403465633 gdb-7.2.tar.bz2 http://ftp.gnu.org/gnu/gdb/ diff --git a/develop/gdb/installed-by-binutils.patch b/develop/gdb/installed-by-binutils.patch deleted file mode 100644 index ff01f7fa9..000000000 --- a/develop/gdb/installed-by-binutils.patch +++ /dev/null @@ -1,91 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../gdb/installed-by-binutils.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Do not install the bfd and obcode libraries and/or other files - -the binutils package supplies them. - - - Clifford Wolf & Rene Rebe - - rediffed for gdb 6.3 by Valentin Ziegler - - re-rediffed for gdb 6.4 by Rene Rebe - - re-rediffed for gdb 6.5 by Aldas Nabazas - -diff -Nur gdb-6.5-orig/bfd/Makefile.in gdb-6.5/bfd/Makefile.in ---- gdb-6.5-orig/bfd/Makefile.in 2006-04-19 12:09:42.000000000 +0000 -+++ gdb-6.5/bfd/Makefile.in 2006-06-23 14:25:06.000000000 +0000 -@@ -257,7 +257,7 @@ - INCDIR = $(srcdir)/../include - CSEARCH = -I. -I$(srcdir) -I$(INCDIR) - MKDEP = gcc -MM --SUBDIRS = doc po -+SUBDIRS = doc - bfddocdir = doc - bfdlib_LTLIBRARIES = libbfd.la - AM_CFLAGS = $(WARN_CFLAGS) -@@ -1158,7 +1158,7 @@ - for dir in "$(DESTDIR)$(bfdlibdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done --install: install-recursive -+install: - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive -diff -Nur gdb-6.5-orig/etc/Makefile.in gdb-6.5/etc/Makefile.in ---- gdb-6.5-orig/etc/Makefile.in 2006-04-06 21:49:30.000000000 +0000 -+++ gdb-6.5/etc/Makefile.in 2006-06-23 14:25:24.000000000 +0000 -@@ -59,7 +59,7 @@ - HTMLFILES = standards.html configure.html - - all: info --install: install-info -+install: - - uninstall: - -diff -Nur gdb-6.5-orig/libiberty/Makefile.in gdb-6.5/libiberty/Makefile.in ---- gdb-6.5-orig/libiberty/Makefile.in 2006-04-07 00:01:25.000000000 +0000 -+++ gdb-6.5/libiberty/Makefile.in 2006-06-23 14:27:47.000000000 +0000 -@@ -330,7 +330,8 @@ - @MAINT@ echo stamp > stamp-functions - - INSTALL_DEST = @INSTALL_DEST@ --install: install_to_$(INSTALL_DEST) install-subdir -+install: -+#install: install_to_$(INSTALL_DEST) install-subdir - - install_to_libdir: all - ${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR) -diff -Nur gdb-6.5-orig/opcodes/Makefile.in gdb-6.5/opcodes/Makefile.in ---- gdb-6.5-orig/opcodes/Makefile.in 2006-04-19 12:10:21.000000000 +0000 -+++ gdb-6.5/opcodes/Makefile.in 2006-06-23 14:26:48.000000000 +0000 -@@ -231,7 +231,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - AUTOMAKE_OPTIONS = 1.9 cygnus --SUBDIRS = po -+SUBDIRS = - INCDIR = $(srcdir)/../include - BFDDIR = $(srcdir)/../bfd - MKDEP = gcc -MM -@@ -837,7 +837,7 @@ - for dir in "$(DESTDIR)$(bfdlibdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done --install: install-recursive -+install: - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive diff --git a/develop/gdb/parallel-make-ppc.patch b/develop/gdb/parallel-make-ppc.patch deleted file mode 100644 index 2a40e1192..000000000 --- a/develop/gdb/parallel-make-ppc.patch +++ /dev/null @@ -1,31 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../gdb/parallel-make-ppc.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -At least the ppc sim is heavily broken for parall build ... - - - Rene Rebe - ---- gdb-6.4/sim/Makefile.in.orig 2005-01-29 01:53:13.000000000 +0100 -+++ gdb-6.4/sim/Makefile.in 2005-12-03 10:54:44.000000000 +0100 -@@ -130,7 +130,7 @@ - if [ "$$dir" = "." ]; then \ - true; \ - elif [ -d $$dir ]; then \ -- (cd $$dir; $(MAKE) $(FLAGS_TO_PASS)) || exit 1; \ -+ (cd $$dir; $(MAKE) $(FLAGS_TO_PASS) -j1) || exit 1; \ - else true; fi; \ - done - diff --git a/develop/gdb/shared_docs.patch b/develop/gdb/shared_docs.patch new file mode 100644 index 000000000..b5babe701 --- /dev/null +++ b/develop/gdb/shared_docs.patch @@ -0,0 +1,47 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../gdb/shared_docs.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +--- ./bfd/Makefile.in.orig 2010-09-07 11:30:51.000000000 +0200 ++++ ./bfd/Makefile.in 2010-09-07 11:32:50.000000000 +0200 +@@ -322,7 +322,6 @@ + # RELEASE=y + INCDIR = $(srcdir)/../include + CSEARCH = -I. -I$(srcdir) -I$(INCDIR) +-SUBDIRS = doc po + bfddocdir = doc + libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \ + @SHARED_LDFLAGS@ $(am__empty) +--- ./opcodes/Makefile.in.orig 2010-09-07 11:31:54.000000000 +0200 ++++ ./opcodes/Makefile.in 2010-09-07 11:32:32.000000000 +0200 +@@ -288,7 +288,6 @@ + ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd + + # Build '.' first so all generated files exist. +-SUBDIRS = . po + INCDIR = $(srcdir)/../include + BFDDIR = $(srcdir)/../bfd + AM_CFLAGS = $(WARN_CFLAGS) +--- ./etc/Makefile.in.orig 2010-09-07 12:07:36.000000000 +0200 ++++ ./etc/Makefile.in 2010-09-07 12:12:26.000000000 +0200 +@@ -90,7 +90,7 @@ + if test ! -f configure.info; then cd $(srcdir); fi; \ + if test -f configure.info; then \ + for i in configure.info*; do \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \ ++ echo $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \ + done; \ + fi +