Add patch from upstream for avr/eclipse compat #126288 by Ian Hubbertz.

(Portage version: 2.1_pre6-r3)

4 files changed, 157 insertions, 1 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 0e7a9dcd0dc1..754ad721be5e 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.87 2006/03/05 18:17:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.88 2006/03/16 00:09:38 vapier Exp $
+
+*gdb-6.4-r4 (16 Mar 2006)
+
+  16 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/gdb-6.4-avr-eclipse.patch, +gdb-6.4-r4.ebuild:
+  Add patch from upstream for avr/eclipse compat #126288 by Ian Hubbertz.
 
 *gdb-6.4-r3 (05 Mar 2006)
 
diff --git a/sys-devel/gdb/files/digest-gdb-6.4-r4 b/sys-devel/gdb/files/digest-gdb-6.4-r4
new file mode 100644
index 000000000000..701f64eee627
--- /dev/null
+++ b/sys-devel/gdb/files/digest-gdb-6.4-r4
@@ -0,0 +1,2 @@
+MD5 f62c14ba0316bc88e1b4b32a4e901ffb gdb-6.4.tar.bz2 13917226
+MD5 35e70c29e393433b3847527d808f59c2 gdb_init.txt.bz2 6247
diff --git a/sys-devel/gdb/files/gdb-6.4-avr-eclipse.patch b/sys-devel/gdb/files/gdb-6.4-avr-eclipse.patch
new file mode 100644
index 000000000000..e7d2893fa835
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.4-avr-eclipse.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/126288
+
+2006-01-21  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* solib.c (info_sharedlibrary_command): Avoid internal_error.
+
+Index: gdb/solib.c
+===================================================================
+RCS file: /cvs/src/src/gdb/solib.c,v
+retrieving revision 1.82
+retrieving revision 1.83
+diff -u -p -r1.82 -r1.83
+--- gdb/solib.c	17 Dec 2005 22:34:02 -0000	1.82
++++ gdb/solib.c	21 Jan 2006 22:23:27 -0000	1.83
+@@ -698,16 +698,8 @@ info_sharedlibrary_command (char *ignore
+   int header_done = 0;
+   int addr_width;
+ 
+-  if (TARGET_PTR_BIT == 32)
+-    addr_width = 8 + 4;
+-  else if (TARGET_PTR_BIT == 64)
+-    addr_width = 16 + 4;
+-  else
+-    {
+-      internal_error (__FILE__, __LINE__,
+-		      _("TARGET_PTR_BIT returned unknown size %d"),
+-		      TARGET_PTR_BIT);
+-    }
++  /* "0x", a little whitespace, and two hex digits per byte of pointers.  */
++  addr_width = 4 + (TARGET_PTR_BIT / 4);
+ 
+   update_solib_list (from_tty, 0);
+ 
diff --git a/sys-devel/gdb/gdb-6.4-r4.ebuild b/sys-devel/gdb/gdb-6.4-r4.ebuild
new file mode 100644
index 000000000000..b56c213cc86a
--- /dev/null
+++ b/sys-devel/gdb/gdb-6.4-r4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.4-r4.ebuild,v 1.1 2006/03/16 00:09:39 vapier Exp $
+
+inherit flag-o-matic eutils
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+
+#DEB_VER=1
+DESCRIPTION="GNU debugger"
+HOMEPAGE="http://sources.redhat.com/gdb/"
+SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+	ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2
+	mirror://gentoo/gdb_init.txt.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+[[ ${CTARGET} != ${CHOST} ]] \
+	&& SLOT="${CTARGET}" \
+	|| SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nls test vanilla"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mv "${WORKDIR}"/gdb_init.txt . || die
+
+	if ! use vanilla ; then
+		if [[ -n ${DEB_VER} ]] ; then
+			epatch "${WORKDIR}"/gdb_${PV}-${DEB_VER}.diff
+			for f in $(<debian/patches/series) ; do
+				EPATCH_SINGLE_MSG="Applying Debian's ${f}" \
+				epatch debian/patches/${f}
+			done
+		fi
+		epatch "${FILESDIR}"/gdb-6.4-uclibc.patch
+		#epatch "${FILESDIR}"/gdb-6.x-crash.patch
+		epatch "${FILESDIR}"/gdb-6.2.1-pass-libdir.patch
+		epatch "${FILESDIR}"/gdb-6.4-scanmem.patch
+		epatch "${FILESDIR}"/gdb-6.3-gdbinit-stat.patch
+		epatch "${FILESDIR}"/bfd-malloc-wrap.patch #91398
+		epatch "${FILESDIR}"/gdb-6.3-partial-die-20050503.patch #120091
+		epatch "${FILESDIR}"/gdb-6.4-avr-eclipse.patch #126288
+
+		epatch "${FILESDIR}"/gdb-6.2.1-200-uclibc-readline-conf.patch
+		epatch "${FILESDIR}"/gdb-6.2.1-400-mips-coredump.patch
+		epatch "${FILESDIR}"/gdb-6.2.1-libiberty-pic.patch
+	fi
+
+	strip-linguas -u bfd/po opcodes/po
+}
+
+src_compile() {
+	replace-flags -O? -O2
+	econf \
+		--disable-werror \
+		$(use_enable nls) \
+		|| die
+	emake -j1 || die
+}
+
+src_test() {
+	make check || ewarn "tests failed"
+}
+
+src_install() {
+	make \
+		prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		libdir="${D}"/nukeme includedir="${D}"/nukeme \
+		install || die "install"
+	# The includes and libs are in binutils already
+	rm -r "${D}"/nukeme
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -r "${D}"/usr/share
+		return 0
+	fi
+
+	dodoc README
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/ChangeLog* gdb/TODO
+	docinto sim
+	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
+	docinto mmalloc
+	dodoc mmalloc/MAINTAINERS mmalloc/ChangeLog mmalloc/TODO
+
+	if use x86 ; then
+		dodir /etc/skel/
+		cp "${S}"/gdb_init.txt "${D}"/etc/skel/.gdbinit \
+			|| die "install ${D}/etc/skel/.gdbinit"
+	fi
+
+	if ! has noinfo ${FEATURES} ; then
+		make \
+			infodir="${D}"/usr/share/info \
+			install-info \
+			|| die "install doc info"
+		# Remove shared info pages
+		rm -f "${D}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+	fi
+}