svn commit: r301875 - in head/devel/gdb: . files

[Wesley Shields]

Author: wxs
Date: Fri Aug  3 02:00:58 2012
New Revision: 301875
URL: http://svn.freebsd.org/changeset/ports/301875

Log:
  Clarify a comment and incorporate a couple of patches.
  
  PR:		ports/170321
  Submitted by:	Luca Pizzamiglio <luca.pizzamiglio at gmail.com> (maintainer)

Modified:
  head/devel/gdb/Makefile   (contents, props changed)
  head/devel/gdb/files/fbsd-threads.c   (contents, props changed)

Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile	Thu Aug  2 22:34:01 2012	(r301874)
+++ head/devel/gdb/Makefile	Fri Aug  3 02:00:58 2012	(r301875)
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdb
 PORTVERSION=	7.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -38,7 +38,8 @@ MAN1=	gdb${VER}.1
 
 ONLY_FOR_ARCHS=	i386 amd64	# untested elsewhere, might work
 
-# Forcing to use the readline.6
+# Forcing to use the readline from ports (readline in FreeBSD world is not
+# compatible anymore).
 LIB_DEPENDS+=	readline:${PORTSDIR}/devel/readline
 CFLAGS+=	-isystem ${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/devel/gdb/files/fbsd-threads.c
==============================================================================
--- head/devel/gdb/files/fbsd-threads.c	Thu Aug  2 22:34:01 2012	(r301874)
+++ head/devel/gdb/files/fbsd-threads.c	Fri Aug  3 02:00:58 2012	(r301875)
@@ -1,4 +1,4 @@
-/* $FreeBSD: /tmp/pcvs/ports/devel/gdb/files/fbsd-threads.c,v 1.4 2012-06-23 09:12:05 scheidell Exp $ */
+/* $FreeBSD$ */
 /* FreeBSD libthread_db assisted debugging support.
    Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
 
@@ -747,8 +747,10 @@ fbsd_thread_wait (struct target_ops *ops
       */
       if (!fbsd_thread_alive (ops, inferior_ptid) && !ptid_equal(inferior_ptid, ret))
         {
-          delete_thread (inferior_ptid);
+          ptid_t save_ptid;
+          save_ptid = inferior_ptid;
           inferior_ptid = ret;
+          delete_thread (save_ptid);
         }
     }
 
@@ -1176,7 +1178,7 @@ tsd_cb (thread_key_t key, void (*destruc
   else
     name = SYMBOL_PRINT_NAME (ms);
 
-  printf_filtered ("Destructor %p <%s>\n", destructor, name);
+  printf_filtered ("Key %d, destructor %p <%s>\n", key, destructor, name);
   return 0;
 }