Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Sep 2015 17:27:25 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397259 - in head/devel/gdb: . files
Message-ID:  <201509181727.t8IHRP5v076335@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb (src,doc committer)
Date: Fri Sep 18 17:27:24 2015
New Revision: 397259
URL: https://svnweb.freebsd.org/changeset/ports/397259

Log:
  Update gdb to 7.10
  
  * Removing patches from the port already committed in upstream
  * Adopting the new OPTION dependent targets (like do-install-PYTHON-on:)
  * Enable support for 64-bit targets on 32-bit systems (e.g. allow the i386
    gdb to debug an amd64 binary).
  * Now supports fork and exec tracing.
  
  PR:		203170
  Submitted by:	luca.pizzamiglio@gmail.com (maintainer)
  Approved by:	tijl

Deleted:
  head/devel/gdb/files/commit-2526815
  head/devel/gdb/files/commit-3ce5b6e
  head/devel/gdb/files/commit-773eacf
  head/devel/gdb/files/commit-97de354
  head/devel/gdb/files/commit-c5cb74e
  head/devel/gdb/files/commit-cf424ae
Modified:
  head/devel/gdb/Makefile
  head/devel/gdb/distinfo
  head/devel/gdb/files/fbsd-threads.c
  head/devel/gdb/files/patch-gdb-configure
  head/devel/gdb/files/patch-gdb-i386fbsd-nat.c
  head/devel/gdb/pkg-plist

Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile	Fri Sep 18 16:16:04 2015	(r397258)
+++ head/devel/gdb/Makefile	Fri Sep 18 17:27:24 2015	(r397259)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gdb
-PORTVERSION=	7.9.1
+PORTVERSION=	7.10
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -17,7 +17,7 @@ CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
 CONFIGURE_ARGS=	--program-suffix=${PORTVERSION:S/.//g} \
-		--enable-targets=all \
+		--enable-targets=all --enable-64-bit-bfd \
 		--with-gdb-datadir=${PREFIX}/share/gdb${PORTVERSION:S/.//g} \
 		--with-separate-debug-dir=/usr/lib/debug \
 		${ICONV_CONFIGURE_ARG} \
@@ -26,12 +26,6 @@ CFLAGS:=	${CFLAGS:C/ +$//}	# blanks at E
 CFLAGS+=	-DRL_NO_COMPAT -Wno-unused-function -Wno-unused-variable
 EXCLUDE=	dejagnu expect sim texinfo intl
 EXTRACT_AFTER_ARGS=	${EXCLUDE:S/^/--exclude /}
-EXTRA_PATCHES=	${FILESDIR}/commit-c5cb74e \
-		${FILESDIR}/commit-cf424ae \
-		${FILESDIR}/commit-773eacf \
-		${FILESDIR}/commit-2526815 \
-		${FILESDIR}/commit-3ce5b6e \
-		${FILESDIR}/commit-97de354
 
 VER=		${PORTVERSION:S/.//g}
 PLIST_SUB=	VER=${VER}
@@ -63,10 +57,10 @@ EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDI
 GUILE_CONFIGURE_ON=	--with-guile
 GUILE_USES=		pkgconfig
 GUILE_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+PORT_READLINE_USES=	readline:port
 PYTHON_CONFIGURE_ON=	--with-python=${PYTHON_CMD}
 PYTHON_CONFIGURE_OFF=	--without-python
 PYTHON_USES=		python:2
-PORT_READLINE_USES=	readline:port
 TUI_CONFIGURE_ENABLE=	tui
 
 .include <bsd.port.options.mk>
@@ -82,10 +76,10 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$| [GDB v${PORTVERSION} for FreeBSD]|' \
 		${WRKSRC}/gdb/version.in
-.if ${PORT_OPTIONS:MTHREADS}
+
+post-patch-THREADS-on:
 	@${CP} ${FILESDIR}/fbsd-threads.c ${WRKSRC}/gdb/
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extrapatch-threads
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \
@@ -93,30 +87,23 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/gdb/doc/gdb.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/gdb${VER}.1
 
-.if ${PORT_OPTIONS:MTUI}
+do-install-TUI-on:
 	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdbtui${VER}
-.endif
 
-.if ${PORT_OPTIONS:MGDB_LINK}
+do-install-GDB_LINK-on:
 	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdb
-.endif
 
-.if ${PORT_OPTIONS:MPYTHON}
+do-install-PYTHON-on:
 	(cd ${WRKSRC}/gdb; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
 	(cd ${WRKSRC}/gdb/data-directory ; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
-.endif
+. for f in gdb gdb/command gdb/function
+	@(cd ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/${f} ; ${CHMOD} 644 *.py* )
+. endfor
 
-.if ${PORT_OPTIONS:MGUILE}
+do-install-GUILE-on:
 	(cd ${WRKSRC}/gdb; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
 	(cd ${WRKSRC}/gdb/data-directory ; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-. for f in gdb gdb/command gdb/function
-	@(cd ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/${f} ; ${CHMOD} 644 *.py* )
-. endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/devel/gdb/distinfo
==============================================================================
--- head/devel/gdb/distinfo	Fri Sep 18 16:16:04 2015	(r397258)
+++ head/devel/gdb/distinfo	Fri Sep 18 17:27:24 2015	(r397259)
@@ -1,2 +1,2 @@
-SHA256 (gdb-7.9.1.tar.xz) = cd9c543a411a05b2b647dd38936034b68c2b5d6f10e0d51dc168c166c973ba40
-SIZE (gdb-7.9.1.tar.xz) = 17867692
+SHA256 (gdb-7.10.tar.xz) = 7ebdaa44f9786ce0c142da4e36797d2020c55fa091905ac5af1846b5756208a8
+SIZE (gdb-7.10.tar.xz) = 18540820

Modified: head/devel/gdb/files/fbsd-threads.c
==============================================================================
--- head/devel/gdb/files/fbsd-threads.c	Fri Sep 18 16:16:04 2015	(r397258)
+++ head/devel/gdb/files/fbsd-threads.c	Fri Sep 18 17:27:24 2015	(r397259)
@@ -675,7 +675,7 @@ attach_thread (ptid_t ptid, const td_thr
     memset(private, 0, sizeof(struct private_thread_info));
 
     tp = add_thread_with_info(ptid, private);
-    tp->private = private;
+    tp->priv = private;
     tp->private_dtor = free_private_thread_info;
   }
 
@@ -1176,9 +1176,9 @@ fbsd_thread_pid_to_str (struct target_op
       if (ti.ti_lid != 0)
         {
           // Need to find the name of this LWP, even though it shouldn't change
-          fbsd_find_lwp_name(ti.ti_lid, tinfo->private);
+          fbsd_find_lwp_name(ti.ti_lid, tinfo->priv);
 
-          if (tinfo->private->lwp_name == NULL)
+          if (tinfo->priv->lwp_name == NULL)
             {
               snprintf(buf, sizeof (buf), "Thread %llx (LWP %d)",
                   (unsigned long long)th.th_thread, ti.ti_lid);
@@ -1187,7 +1187,7 @@ fbsd_thread_pid_to_str (struct target_op
             {
               snprintf(buf, sizeof (buf), "Thread %llx (LWP %d %s)",
                   (unsigned long long)th.th_thread, ti.ti_lid,
-                  tinfo->private->lwp_name);
+                  tinfo->priv->lwp_name);
             }
         }
       else

Modified: head/devel/gdb/files/patch-gdb-configure
==============================================================================
--- head/devel/gdb/files/patch-gdb-configure	Fri Sep 18 16:16:04 2015	(r397258)
+++ head/devel/gdb/files/patch-gdb-configure	Fri Sep 18 17:27:24 2015	(r397259)
@@ -22,16 +22,3 @@ index 355f190..9c60e01 100755
  "
  if test "x$ac_cv_member_struct_reg_r_gs" = x""yes; then :
  
-@@ -12945,10 +12947,9 @@ fi
- 
- build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
- -Wpointer-sign \
---Wno-unused -Wunused-value -Wunused-function \
-+-Wno-unused -Wunused-value \
- -Wno-switch -Wno-char-subscripts -Wmissing-prototypes \
---Wdeclaration-after-statement -Wempty-body -Wmissing-parameter-type \
---Wold-style-declaration -Wold-style-definition"
-+-Wdeclaration-after-statement -Wempty-body -Wold-style-definition"
- 
- # Enable -Wno-format by default when using gcc on mingw since many
- # GCC versions complain about %I64.

Modified: head/devel/gdb/files/patch-gdb-i386fbsd-nat.c
==============================================================================
--- head/devel/gdb/files/patch-gdb-i386fbsd-nat.c	Fri Sep 18 16:16:04 2015	(r397258)
+++ head/devel/gdb/files/patch-gdb-i386fbsd-nat.c	Fri Sep 18 17:27:24 2015	(r397259)
@@ -7,6 +7,5 @@ index 6c43f2c..a205a26 100644
  #endif
  
 -  t->to_resume = i386fbsd_resume;
-   t->to_pid_to_exec_file = fbsd_pid_to_exec_file;
-   t->to_find_memory_regions = fbsd_find_memory_regions;
-   add_target (t);
+   fbsd_nat_add_target (t);
+   /* Support debugging kernel virtual memory images.  */

Modified: head/devel/gdb/pkg-plist
==============================================================================
--- head/devel/gdb/pkg-plist	Fri Sep 18 16:16:04 2015	(r397258)
+++ head/devel/gdb/pkg-plist	Fri Sep 18 17:27:24 2015	(r397259)
@@ -9,6 +9,7 @@ man/man1/gdb%%VER%%.1.gz
 %%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/unwinder.py
 %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/xmethod.py
 %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/__init__.py
 %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/explore.py
@@ -16,6 +17,7 @@ man/man1/gdb%%VER%%.1.gz
 %%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/unwinders.py
 %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/xmethods.py
 %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/__init__.py
 %%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/caller_is.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509181727.t8IHRP5v076335>