Attachment 145341 Details for Bug 192323 – An improved version of the proposed patch

[patch] An improved version of the proposed patch

gdb.diff (text/plain), 3.84 KB, created by luca.pizzamiglio on 2014-08-04 14:44:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: luca.pizzamiglio

Created: 2014-08-04 14:44:32 UTC

Size: 3.84 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 364013)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gdb
>-PORTVERSION=	7.7.1
>+PORTVERSION=	7.8
> CATEGORIES=	devel
> MASTER_SITES=	GNU
> 
>@@ -11,7 +11,7 @@
> 
> LICENSE=	GPLv3
> 
>-USES=		iconv gmake libtool tar:bzip2
>+USES=		iconv gmake libtool tar:xz
> USE_CSTD=	gnu89
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
>@@ -101,9 +101,9 @@
> .endif
> 
> .if ${PORT_OPTIONS:MPYTHON}
>-	(cd ${WRKSRC}/gdb; ${MAKE_CMD} DESTDIR=${STAGEDIR} install-python )
>+	(cd ${WRKSRC}/gdb; ${GMAKE} DESTDIR=${STAGEDIR} install-python )
> 	(cd ${WRKSRC}/gdb/data-directory ; \
>-		${MAKE_CMD} DESTDIR=${STAGEDIR} install-python )
>+		${GMAKE} DESTDIR=${STAGEDIR} install-python )
> .endif
> 
> .if ${PORT_OPTIONS:MPYTHON}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 364013)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gdb-7.7.1.tar.bz2) = 0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5
>-SIZE (gdb-7.7.1.tar.bz2) = 24849503
>+SHA256 (gdb-7.8.tar.xz) = 49c4abe174f79f54e1f9e75210ffb590d9b497d5b5200b5398c0e073a4ecb875
>+SIZE (gdb-7.8.tar.xz) = 17664316
>Index: files/fbsd-threads.c
>===================================================================
>--- files/fbsd-threads.c	(revision 364013)
>+++ files/fbsd-threads.c	(working copy)
>@@ -1296,7 +1296,7 @@
>   if (!bms.minsym)
>     name = "???";
>   else
>-    name = SYMBOL_PRINT_NAME (bms.minsym);
>+    name = MSYMBOL_PRINT_NAME (bms.minsym);
> 
>   printf_filtered ("Key %d, destructor %p <%s>\n", key, destructor, name);
>   return 0;
>@@ -1505,11 +1505,11 @@
>   struct minimal_symbol *ms;
>   CORE_ADDR addr;
> 
>-  ms = lookup_minimal_symbol (name, NULL, NULL);
>+  ms = lookup_minimal_symbol (name, NULL, NULL).minsym;
>   if (ms == NULL)
>     return PS_NOSYM;
> 
>-  *sym_addr = SYMBOL_VALUE_ADDRESS (ms);
>+  *sym_addr = ms->mginfo.value.address;
>   return PS_OK;
> }
> 
>Index: files/patch-unified
>===================================================================
>--- files/patch-unified	(revision 364013)
>+++ files/patch-unified	(working copy)
>@@ -1,24 +1,14 @@
> --- gdb/gdb.c	Thu Feb 13 13:07:24 2003
> +++ gdb/gdb.c	Wed May 17 00:24:39 2006
>-@@ -23,4 +23,5 @@
>- #include "gdb_string.h"
>- #include "interps.h"
>-+#include <libgen.h>
>- 
>- int
>-@@ -31,6 +32,14 @@
>+@@ -31,5 +32,11 @@
>    args.argc = argc;
>    args.argv = argv;
>--  args.use_windows = 0;
> -  args.interpreter_p = INTERP_CONSOLE;
> +  if (strncmp(basename(argv[0]), "insight", 7) == 0) {
>-+    args.use_windows = 1;
> +    args.interpreter_p = "insight";
> +  } else if (strncmp(basename(argv[0]), "gdbtui", 6) == 0) {
>-+    args.use_windows = 0;
> +    args.interpreter_p = INTERP_TUI;
> +  } else {
>-+    args.use_windows = 0;
> +    args.interpreter_p = INTERP_CONSOLE;
> +  }
>    return gdb_main (&args);
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 364013)
>+++ pkg-plist	(working copy)
>@@ -9,6 +9,7 @@
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/printing.py
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/prompt.py
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/types.py
>+%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/xmethod.py
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/__init__.py
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/bound_registers.py
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/explore.py
>@@ -16,6 +17,7 @@
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/pretty_printers.py
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/prompt.py
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/type_printers.py
>+%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/xmethods.py
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/__init__.py
> %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/strfns.py
> %%PYTHON%%@dirrmtry %%DATADIR%%%%VER%%/python/gdb/function

Flags:

luca.pizzamiglio: maintainer-approval+

Actions: View | Diff

Attachments on bug 192323: 145234 | 145341