If <stdlib.h> is needed and its wrapped with HAVE_STDDLIB_H it must be

tested for by autoconf!

<stdlib.h> is needed as it include <alloca.h> which is needed for alloca(3).

Also fix DESTDIR support for gdbserver.

4 files changed, 42 insertions, 2 deletions

diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 9317755ceaf..6c78f689c5a 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2011/04/22 13:43:18 obache Exp $
+# $NetBSD: Makefile,v 1.40 2011/12/05 22:15:05 sbd Exp $
 #
 
 DISTNAME=	gdb-5.3
@@ -30,6 +30,13 @@ CONFIGURE_ENV+=		CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
 .if ${OPSYS} == "SunOS"
 # Work around a bug in gdb's configure
 CONFIGURE_ENV+=		ac_cv_header_curses_h=yes
+.elif ${OPSYS} == "Linux"
+USE_TOOLS+=		aclocal autoheader autoconf
+
+pre-configure:
+	${RUN} cd ${WRKSRC}/gdb/gdbserver &&				\
+	aclocal && autoheader && autoconf
+
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/gdb/distinfo b/devel/gdb/distinfo
index c7a3ac20c9f..98bba27df3d 100644
--- a/devel/gdb/distinfo
+++ b/devel/gdb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2011/12/05 22:05:29 sbd Exp $
+$NetBSD: distinfo,v 1.17 2011/12/05 22:15:05 sbd Exp $
 
 SHA1 (gdb-5.3.tar.gz) = 24a6c9da6e89b1b82b7508f27f94098d989ff662
 RMD160 (gdb-5.3.tar.gz) = 3f88dc11115de08708c50c73b10acaf00ed25e96
@@ -24,6 +24,8 @@ SHA1 (patch-as) = 77a2f8eb5e1f076cba915c80113cfe5bf617efaf
 SHA1 (patch-bfd_po_Make-in) = 9e09652c95dbea0d7017102546c4e959abc199da
 SHA1 (patch-gdb_Makefile.in) = 229c14522ddf8f5ddfdd414d77be1ddefc5635db
 SHA1 (patch-gdb_doc_Makefile.in) = 44f1fc8db2f37dae1ba0db3ae1192ec8ef47f4a3
+SHA1 (patch-gdb_gdbserver_Makefile.in) = 00e0015600847401ecd4471afd53c7e5030e1f15
+SHA1 (patch-gdb_gdbserver_configure.in) = 99033ce02ce2e41a51694fd0dfe3e767868dd5b7
 SHA1 (patch-mmalloc_Makefile.in) = 1c45f0b326b838d442979e4ada45c0e5fc2da1c5
 SHA1 (patch-ob) = 52c017dfa9f535edc9520144efa8ef04a8020832
 SHA1 (patch-opcodes_po_Make-in) = c4f9d3d19a52acab6c18454b1ff95c9e1302c5bf
diff --git a/devel/gdb/patches/patch-gdb_gdbserver_Makefile.in b/devel/gdb/patches/patch-gdb_gdbserver_Makefile.in
new file mode 100644
index 00000000000..167d36aa784
--- /dev/null
+++ b/devel/gdb/patches/patch-gdb_gdbserver_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-gdb_gdbserver_Makefile.in,v 1.1 2011/12/05 22:15:05 sbd Exp $
+
+--- gdb/gdbserver/Makefile.in.orig	2002-08-20 21:32:18.000000000 +0000
++++ gdb/gdbserver/Makefile.in
+@@ -145,8 +145,8 @@ install: all install-only
+ install-only: 
+ 	n=`echo gdbserver | sed '$(program_transform_name)'`; \
+ 	if [ x$$n = x ]; then n=gdbserver; else true; fi; \
+-	$(INSTALL_PROGRAM) gdbserver $(bindir)/$$n; \
+-	$(INSTALL_DATA) $(srcdir)/gdbserver.1 $(man1dir)/$$n.1
++	$(INSTALL_PROGRAM) gdbserver $(DESTDIR)$(bindir)/$$n; \
++	$(INSTALL_DATA) $(srcdir)/gdbserver.1 $(DESTDIR)$(man1dir)/$$n.1
+ 
+ uninstall: force
+ 	n=`echo gdbserver | sed '$(program_transform_name)'`; \
diff --git a/devel/gdb/patches/patch-gdb_gdbserver_configure.in b/devel/gdb/patches/patch-gdb_gdbserver_configure.in
new file mode 100644
index 00000000000..deba95fa98b
--- /dev/null
+++ b/devel/gdb/patches/patch-gdb_gdbserver_configure.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-gdb_gdbserver_configure.in,v 1.1 2011/12/05 22:15:05 sbd Exp $
+
+If <stdlib.h> is needed and its wrapped with HAVE_STDDLIB_H  it must be
+tested for by autoconf!
+
+--- gdb/gdbserver/configure.in.orig	2002-07-24 21:30:46.000000000 +0000
++++ gdb/gdbserver/configure.in
+@@ -30,7 +30,7 @@ AC_PROG_INSTALL
+ 
+ AC_HEADER_STDC
+ 
+-AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl
++AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl stdlib.h
+ 		 proc_service.h sys/procfs.h thread_db.h linux/elf.h unistd.h)
+ 
+ . ${srcdir}/configure.srv