Version bump to Developer Tools 3.2.2 version

(Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)

3 files changed, 216 insertions, 1 deletions

diff --git a/sys-devel/gdb-apple/ChangeLog b/sys-devel/gdb-apple/ChangeLog
index 250486663204..39dc2634c479 100644
--- a/sys-devel/gdb-apple/ChangeLog
+++ b/sys-devel/gdb-apple/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gdb-apple
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/ChangeLog,v 1.7 2010/03/05 16:25:26 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/ChangeLog,v 1.8 2010/05/21 16:03:55 grobian Exp $
+
+*gdb-apple-1461 (21 May 2010)
+
+  21 May 2010; Fabian Groffen <grobian@gentoo.org> +gdb-apple-1461.ebuild,
+  +files/gdb-apple-1461-darwin8.patch:
+  Version bump to Developer Tools 3.2.2 version
 
   05 Mar 2010; Fabian Groffen <grobian@gentoo.org> gdb-apple-563.ebuild,
   gdb-apple-768-r1.ebuild, gdb-apple-960.ebuild, gdb-apple-962.ebuild,
diff --git a/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch b/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch
new file mode 100644
index 000000000000..93aded6e2e8b
--- /dev/null
+++ b/sys-devel/gdb-apple/files/gdb-apple-1461-darwin8.patch
@@ -0,0 +1,147 @@
+--- gdb-1461.2/src/gdb/macosx/macosx-nat-dyld.c
++++ gdb-1461.2/src/gdb/macosx/macosx-nat-dyld.c
+@@ -731,7 +731,7 @@
+ {
+ #if !defined (TASK_DYLD_INFO) || !defined (NM_NEXTSTEP)
+   return 0;
+-#endif
++#else
+ 
+   if (target_is_remote () || value == NULL)
+     return 0;
+@@ -791,6 +791,7 @@
+     }
+ #endif /* NM_NEXTSTEP */
+   return 0;
++#endif
+ }
+ 
+ /* Searches the target address space for dyld itself, returning it in
+--- gdb-1461.2/src/gdb/macosx/macosx-nat-inferior.c
++++ gdb-1461.2/src/gdb/macosx/macosx-nat-inferior.c
+@@ -60,13 +60,17 @@
+ #include <sys/sysctl.h>
+ #include <sys/proc.h>
+ #include <mach/mach_error.h>
++#if defined(TARGET_ARM)
+ #include <spawn.h>
++#endif
+ 
+ #include <semaphore.h>
+ 
+ #include <dlfcn.h>
++#if 0
+ #include <libproc.h>
+ #include <sys/proc_info.h>
++#endif
+ 
+ #include "macosx-nat-dyld.h"
+ #include "macosx-nat-inferior.h"
+--- gdb-1461.2/src/gdb/macosx/macosx-nat-info.c
++++ gdb-1461.2/src/gdb/macosx/macosx-nat-info.c
+@@ -45,6 +45,22 @@
+ #include "macosx-nat-inferior.h"
+ #include "macosx-nat-inferior-debug.h"
+ 
++#ifdef __ppc__
++#ifndef __darwin_ppc_thread_state
++#define __darwin_ppc_thread_state ppc_thread_state
++#define __r0       r0
++#define __srr0     srr0
++#define __srr1     srr1
++#define __cr       cr
++#define __xer      xer
++#define __lr       lr
++#define __ctr      ctr
++#endif
++#ifndef __darwin_ppc_exception_state
++#define __darwin_ppc_exception_state ppc_exception_state
++#endif
++#endif
++
+ extern macosx_inferior_status *macosx_status;
+ 
+ #define CHECK_ARGS(what, args) \
+--- gdb-1461.2/src/gdb/macosx/macosx-nat-infthread.c
++++ gdb-1461.2/src/gdb/macosx/macosx-nat-infthread.c
+@@ -36,8 +36,10 @@
+ #include <sys/dir.h>
+ #include <inttypes.h>
+ 
++#if 0
+ #include <libproc.h>
+ #include <sys/proc_info.h>
++#endif
+ 
+ #include "macosx-nat-inferior.h"
+ #include "macosx-nat-inferior-util.h"
+--- gdb-1461.2/src/gdb/macosx/macosx-tdep.c
++++ gdb-1461.2/src/gdb/macosx/macosx-tdep.c
+@@ -63,7 +63,6 @@
+ #include "gdbcore.h"
+ 
+ #include <dirent.h>
+-#include <libgen.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+--- gdb-1461.2/src/gdb/remote.c
++++ gdb-1461.2/src/gdb/remote.c
+@@ -62,7 +62,6 @@
+ #include "macosx-nat-dyld.h"
+ #include "macosx-nat-dyld-process.h"
+ #endif
+-#include <execinfo.h>
+ 
+ /* Prototypes for local functions.  */
+ static void cleanup_sigint_signal_handler (void *dummy);
+@@ -474,11 +473,13 @@
+ static void
+ remote_backtrace_self (const char *message)
+ {
++#if 0
+   void *bt_buffer[100];
+   int count = backtrace (bt_buffer, 100);
+   if (message && message[0])
+     fprintf_filtered (gdb_stderr, "%s", message);
+   backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
++#endif
+ }
+ 
+ static void
+--- gdb-1461.2/src/gdb/symfile.c
++++ gdb-1461.2/src/gdb/symfile.c
+@@ -67,7 +67,6 @@
+ #include <ctype.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#include <libgen.h>
+ 
+ #include <sys/mman.h>
+ 
+--- gdb-1461.2/src/gdb/utils.c
++++ gdb-1461.2/src/gdb/utils.c
+@@ -27,7 +27,6 @@
+ #include "gdb_string.h"
+ #include "event-top.h"
+ #include "exceptions.h"
+-#include <execinfo.h>
+ 
+ #ifdef TUI
+ #include "tui/tui.h"		/* For tui_get_command_dimension.   */
+@@ -874,6 +873,7 @@
+   target_terminal_ours ();
+   begin_line ();
+ 
++#if 0
+   /* APPLE LOCAL: Do a stack crawl of how we got here so we're more likely
+      to get useful bug reports.  */
+   {
+@@ -882,6 +882,7 @@
+     fprintf (stderr, "gdb stack crawl at point of internal error:\n");
+     backtrace_symbols_fd (bt_buffer, count, STDERR_FILENO);
+   }
++#endif
+ 
+   /* Create a string containing the full error/warning message.  Need
+      to call query with this full string, as otherwize the reason
diff --git a/sys-devel/gdb-apple/gdb-apple-1461.ebuild b/sys-devel/gdb-apple/gdb-apple-1461.ebuild
new file mode 100644
index 000000000000..4e45db0f5af0
--- /dev/null
+++ b/sys-devel/gdb-apple/gdb-apple-1461.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb-apple/gdb-apple-1461.ebuild,v 1.1 2010/05/21 16:03:55 grobian Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic
+
+APPLE_PV=${PV}.2
+DESCRIPTION="Apple branch of the GNU Debugger, Developer Tools 3.2.2"
+HOMEPAGE="http://sources.redhat.com/gdb/"
+SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gdb-${APPLE_PV}.tar.gz"
+
+LICENSE="APSL-2 GPL-2"
+SLOT="0"
+
+KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="nls"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2
+	=dev-db/sqlite-3*"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/gdb-${APPLE_PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-768-texinfo.patch
+	[[ ${CHOST} == *-darwin8 ]] && epatch "${FILESDIR}"/${P}-darwin8.patch
+
+	# for FSF gcc / gcc-apple:42
+	sed -e 's/-Wno-long-double//' -i gdb/config/*/macosx.mh
+}
+
+src_configure() {
+	replace-flags -O? -O2
+	econf \
+		--disable-werror \
+		$(use_enable nls) \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" libdir=/nukeme includedir=/nukeme install || die
+	rm -R "${D}"/nukeme || die
+	rm -Rf "${ED}"/usr/${CHOST} || die
+	mv "${ED}"/usr/bin/gdb ${ED}/
+	rm -f "${ED}"/usr/bin/*
+	mv "${ED}"/gdb "${ED}"/usr/bin/
+}
+
+pkg_postinst() {
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then
+		ewarn "Due to increased security measures in 10.5 and up, gdb is"
+		ewarn "not able to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}