- Split THREADS patches to better support GNU binutils

PR:		ports/169662
Submitted by:	Luca Pizzamiglio <luca.pizzamiglio@gmail.com> (maintainer)

4 files changed, 34 insertions, 28 deletions

diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 7c8cdccb0186..710dbf349cd3 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdb
 PORTVERSION=	7.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -61,6 +61,10 @@ USE_PYTHON=	2.5-2.7
 
 .include <bsd.port.pre.mk>
 
+.if ${PORT_OPTIONS:MTHREADS}
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-gdb-configure.tgt ${FILESDIR}/extrapatch-gdb-Makefile.in
+.endif
+
 .if ${PORT_OPTIONS:MDEBUG}
 CFLAGS+=	-g
 .endif
diff --git a/devel/gdb/files/extrapatch-gdb-Makefile.in b/devel/gdb/files/extrapatch-gdb-Makefile.in
new file mode 100644
index 000000000000..ed14d55468c1
--- /dev/null
+++ b/devel/gdb/files/extrapatch-gdb-Makefile.in
@@ -0,0 +1,29 @@
+--- gdb/Makefile.in.orig	2011-03-30 07:55:39.000000000 +0100
++++ gdb/Makefile.in	2011-10-29 08:02:29.600973609 +0100
+@@ -571,7 +571,7 @@
+ 	xstormy16-tdep.o \
+ 	xtensa-config.o xtensa-tdep.o xtensa-linux-tdep.o \
+ 	glibc-tdep.o \
+-	bsd-uthread.o \
++	fbsd-threads.o \
+ 	nbsd-tdep.o obsd-tdep.o \
+ 	sol2-tdep.o \
+ 	solib-frv.o solib-irix.o solib-svr4.o solib-target.o \
+@@ -782,7 +782,7 @@
+ gnulib/stdint.in.h remote.h gdb.h sparc-nat.h \
+ gdbthread.h dwarf2-frame.h dwarf2-frame-tailcall.h nbsd-nat.h dcache.h \
+ amd64-nat.h s390-tdep.h arm-linux-tdep.h exceptions.h macroscope.h \
+-gdbarch.h bsd-uthread.h gdb_stat.h memory-map.h	memrange.h \
++gdbarch.h gdb_stat.h memory-map.h	memrange.h \
+ mdebugread.h m88k-tdep.h stabsread.h hppa-linux-offsets.h linux-fork.h \
+ ser-unix.h inf-ptrace.h terminal.h ui-out.h frame-base.h \
+ f-lang.h dwarf2loc.h value.h sparc-tdep.h defs.h target-descriptions.h \
+@@ -1452,7 +1452,7 @@
+ 	armnbsd-nat.c armbsd-tdep.c armnbsd-tdep.c armobsd-tdep.c \
+ 	avr-tdep.c \
+ 	bfin-linux-tdep.c bfin-tdep.c \
+-	bsd-uthread.c bsd-kvm.c \
++	fbsd-threads.c bsd-kvm.c \
+ 	core-regset.c corelow.c \
+ 	dcache.c dicos-tdep.c darwin-nat.c \
+ 	exec.c \
diff --git a/devel/gdb/files/patch-gdb-configure.tgt b/devel/gdb/files/extrapatch-gdb-configure.tgt
index 71c875e8e063..71c875e8e063 100644
--- a/devel/gdb/files/patch-gdb-configure.tgt
+++ b/devel/gdb/files/extrapatch-gdb-configure.tgt
diff --git a/devel/gdb/files/patch-gdb-Makefile.in b/devel/gdb/files/patch-gdb-Makefile.in
index 037a40c97048..f352d0b57914 100644
--- a/devel/gdb/files/patch-gdb-Makefile.in
+++ b/devel/gdb/files/patch-gdb-Makefile.in
@@ -1,14 +1,5 @@
 --- gdb/Makefile.in.orig	2011-03-30 07:55:39.000000000 +0100
 +++ gdb/Makefile.in	2011-10-29 08:02:29.600973609 +0100
-@@ -571,7 +571,7 @@
- 	xstormy16-tdep.o \
- 	xtensa-config.o xtensa-tdep.o xtensa-linux-tdep.o \
- 	glibc-tdep.o \
--	bsd-uthread.o \
-+	fbsd-threads.o \
- 	nbsd-tdep.o obsd-tdep.o \
- 	sol2-tdep.o \
- 	solib-frv.o solib-irix.o solib-svr4.o solib-target.o \
 @@ -758,7 +758,7 @@
  osf-share/cma_deb_core.h osf-share/AT386/cma_thread_io.h \
  osf-share/cma_sched.h proc-utils.h arm-tdep.h ax-gdb.h ppcnbsd-tdep.h \
@@ -18,15 +9,6 @@
  i386bsd-nat.h xml-support.h xml-tdesc.h alphabsd-tdep.h gdb_obstack.h \
  ia64-tdep.h ada-lang.h varobj.h frv-tdep.h nto-tdep.h serial.h \
  c-lang.h d-lang.h frame.h event-loop.h block.h cli/cli-setshow.h	\
-@@ -782,7 +782,7 @@
- gnulib/stdint.in.h remote.h gdb.h sparc-nat.h \
- gdbthread.h dwarf2-frame.h dwarf2-frame-tailcall.h nbsd-nat.h dcache.h \
- amd64-nat.h s390-tdep.h arm-linux-tdep.h exceptions.h macroscope.h \
--gdbarch.h bsd-uthread.h gdb_stat.h memory-map.h	memrange.h \
-+gdbarch.h gdb_stat.h memory-map.h	memrange.h \
- mdebugread.h m88k-tdep.h stabsread.h hppa-linux-offsets.h linux-fork.h \
- ser-unix.h inf-ptrace.h terminal.h ui-out.h frame-base.h \
- f-lang.h dwarf2loc.h value.h sparc-tdep.h defs.h target-descriptions.h \
 @@ -1161,7 +1161,7 @@
  # Removing the old gdb first works better if it is running, at least on SunOS.
  gdb$(EXEEXT): gdb.o libgdb.a $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
@@ -36,12 +18,3 @@
  		-o gdb$(EXEEXT) gdb.o libgdb.a \
  		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
  
-@@ -1452,7 +1452,7 @@
- 	armnbsd-nat.c armbsd-tdep.c armnbsd-tdep.c armobsd-tdep.c \
- 	avr-tdep.c \
- 	bfin-linux-tdep.c bfin-tdep.c \
--	bsd-uthread.c bsd-kvm.c \
-+	fbsd-threads.c bsd-kvm.c \
- 	core-regset.c corelow.c \
- 	dcache.c dicos-tdep.c darwin-nat.c \
- 	exec.c \