[packages/gdb.git] / gdb-readline.patch

diff -ur gdb-5.1.orig/Makefile.in gdb-5.1/Makefile.in
--- gdb-5.1.orig/Makefile.in	Sun Nov 18 20:37:49 2001
+++ gdb-5.1/Makefile.in	Tue Jan 22 23:52:34 2002
@@ -530,7 +530,6 @@
 	all-perl \
 	all-prms \
 	all-rcs \
-	all-readline \
 	all-release \
 	all-recode \
 	all-sed \
@@ -607,7 +606,6 @@
 	check-perl \
 	check-prms \
 	check-rcs \
-	check-readline \
 	check-recode \
 	check-sed \
 	check-send-pr \
@@ -684,7 +682,6 @@
 	install-perl \
 	install-prms \
 	install-rcs \
-	install-readline \
 	install-recode \
 	install-sed \
 	install-send-pr \
@@ -886,7 +883,6 @@
 	clean-perl \
 	clean-prms \
 	clean-rcs \
-	clean-readline \
 	clean-release \
 	clean-recode \
 	clean-sed \
@@ -1602,7 +1598,7 @@
 all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
 all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
 GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
-all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
 all-gettext:
 all-gnuserv:
 configure-target-gperf: $(ALL_GCC_C)
@@ -1662,13 +1658,12 @@
 configure-target-qthreads: $(ALL_GCC_C)
 all-target-qthreads: configure-target-qthreads
 all-rcs:
-all-readline:
 all-recode: all-libiberty
 all-sed: all-libiberty
 all-send-pr: all-prms
 all-shellutils:
 all-sid: all-tcl all-tk
-all-sim: all-libiberty all-bfd all-opcodes all-readline all-cgen
+all-sim: all-libiberty all-bfd all-opcodes all-cgen
 all-snavigator: all-tcl all-tk all-itcl all-db all-grep all-libgui
 all-tar: all-libiberty
 all-tcl:
@@ -1925,7 +1920,7 @@
 		SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
 
 .PHONY: gdb.tar.bz2
-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes sim utils intl
 gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
 	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
 		MD5PROG="$(MD5PROG)" \
diff -ur gdb-5.1.orig/gdb/Makefile.in gdb-5.1/gdb/Makefile.in
--- gdb-5.1.orig/gdb/Makefile.in	Sun Nov 18 06:08:36 2001
+++ gdb-5.1/gdb/Makefile.in	Tue Jan 22 23:54:56 2002
@@ -120,10 +120,10 @@
 BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
 
 # Where is the READLINE library?  Typically in ../readline.
-READLINE_DIR = ../readline
-READLINE = $(READLINE_DIR)/libreadline.a
-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
-READLINE_CFLAGS = -I$(READLINE_SRC)/..
+READLINE_DIR = /usr/include/readline
+READLINE = -lreadline
+READLINE_SRC = /usr/include/readline
+READLINE_CFLAGS = -I/usr/include/readline
 
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
diff -ur gdb-5.1.orig/gdb/defs.h gdb-5.1/gdb/defs.h
--- gdb-5.1.orig/gdb/defs.h	Thu Aug  2 23:36:51 2001
+++ gdb-5.1/gdb/defs.h	Tue Jan 22 23:59:50 2002
@@ -800,7 +800,7 @@
 
 /* From readline (but not in any readline .h files).  */
 
-extern char *tilde_expand (char *);
+extern char *tilde_expand (const char *);
 
 /* Control types for commands */
 
diff -ur gdb-5.1.orig/gdb/event-top.c gdb-5.1/gdb/event-top.c
--- gdb-5.1.orig/gdb/event-top.c	Sat Jul 14 20:59:07 2001
+++ gdb-5.1/gdb/event-top.c	Tue Jan 22 23:59:50 2002
@@ -32,6 +32,7 @@
 #include "gdbcmd.h"
 
 /* readline include files */
+#define savestring
 #include <readline/readline.h>
 #include <readline/history.h>
 
diff -ur gdb-5.1.orig/gdb/gdbserver/Makefile.in gdb-5.1/gdb/gdbserver/Makefile.in
--- gdb-5.1.orig/gdb/gdbserver/Makefile.in	Tue Mar  6 09:21:43 2001
+++ gdb-5.1/gdb/gdbserver/Makefile.in	Tue Jan 22 23:59:50 2002
@@ -88,7 +88,7 @@
 
 # Where is the source dir for the READLINE library?  Traditionally in .. or .
 # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
-READLINE_DIR = ${srcdir}/../readline
+READLINE_DIR = /usr/lib
 READLINE_DEP = $$(READLINE_DIR)
 
 # All the includes used for CFLAGS and for lint.
diff -ur gdb-5.1.orig/gdb/top.c gdb-5.1/gdb/top.c
--- gdb-5.1.orig/gdb/top.c	Sun Oct 21 21:41:19 2001
+++ gdb-5.1/gdb/top.c	Tue Jan 22 23:59:50 2002
@@ -42,6 +42,7 @@
 #include "serial.h"
 
 /* readline include files */
+#define savestring
 #include <readline/readline.h>
 #include <readline/history.h>
 
diff -ur gdb-5.1.orig/gdb/tracepoint.c gdb-5.1/gdb/tracepoint.c
--- gdb-5.1.orig/gdb/tracepoint.c	Thu Aug  2 14:05:57 2001
+++ gdb-5.1/gdb/tracepoint.c	Tue Jan 22 23:59:50 2002
@@ -40,6 +40,7 @@
 #include "ax-gdb.h"
 
 /* readline include files */
+#define savestring
 #include <readline/readline.h>
 #include <readline/history.h>
 
diff -ur gdb-5.1.orig/gdb/utils.c gdb-5.1/gdb/utils.c
--- gdb-5.1.orig/gdb/utils.c	Fri Nov  2 23:06:29 2001
+++ gdb-5.1/gdb/utils.c	Tue Jan 22 23:59:50 2002
@@ -54,6 +54,7 @@
 
 #include "inferior.h" /* for signed_pointer_to_address */
 
+#define savestring
 #include <readline/readline.h>
 
 #ifndef MALLOC_INCOMPATIBLE
Commit	Line	Data
5f1c61ac	1	diff -ur gdb-5.1.orig/Makefile.in gdb-5.1/Makefile.in
	2	--- gdb-5.1.orig/Makefile.in Sun Nov 18 20:37:49 2001
	3	+++ gdb-5.1/Makefile.in Tue Jan 22 23:52:34 2002
	4	@@ -530,7 +530,6 @@
1013231d AM	5	all-perl \
	6	all-prms \
	7	all-rcs \
	8	- all-readline \
	9	all-release \
	10	all-recode \
	11	all-sed \
5f1c61ac	12	@@ -607,7 +606,6 @@
1013231d AM	13	check-perl \
	14	check-prms \
	15	check-rcs \
	16	- check-readline \
	17	check-recode \
	18	check-sed \
	19	check-send-pr \
5f1c61ac	20	@@ -684,7 +682,6 @@
1013231d AM	21	install-perl \
	22	install-prms \
	23	install-rcs \
	24	- install-readline \
	25	install-recode \
	26	install-sed \
	27	install-send-pr \
5f1c61ac	28	@@ -886,7 +883,6 @@
1013231d AM	29	clean-perl \
	30	clean-prms \
	31	clean-rcs \
	32	- clean-readline \
	33	clean-release \
	34	clean-recode \
	35	clean-sed \
5f1c61ac	36	@@ -1602,7 +1598,7 @@
	37	all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
	38	all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
1013231d AM	39	GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
	40	-all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
	41	+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
	42	all-gettext:
	43	all-gnuserv:
5f1c61ac	44	configure-target-gperf: $(ALL_GCC_C)
	45	@@ -1662,13 +1658,12 @@
	46	configure-target-qthreads: $(ALL_GCC_C)
	47	all-target-qthreads: configure-target-qthreads
1013231d AM	48	all-rcs:
	49	-all-readline:
	50	all-recode: all-libiberty
	51	all-sed: all-libiberty
	52	all-send-pr: all-prms
	53	all-shellutils:
5f1c61ac	54	all-sid: all-tcl all-tk
	55	-all-sim: all-libiberty all-bfd all-opcodes all-readline all-cgen
	56	+all-sim: all-libiberty all-bfd all-opcodes all-cgen
	57	all-snavigator: all-tcl all-tk all-itcl all-db all-grep all-libgui
1013231d AM	58	all-tar: all-libiberty
1013231d AM	59	all-tcl:
5f1c61ac	60	@@ -1925,7 +1920,7 @@
1013231d AM	61	SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
	62
	63	.PHONY: gdb.tar.bz2
	64	-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
	65	+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes sim utils intl
	66	gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
	67	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
	68	MD5PROG="$(MD5PROG)" \
5f1c61ac	69	diff -ur gdb-5.1.orig/gdb/Makefile.in gdb-5.1/gdb/Makefile.in
	70	--- gdb-5.1.orig/gdb/Makefile.in Sun Nov 18 06:08:36 2001
	71	+++ gdb-5.1/gdb/Makefile.in Tue Jan 22 23:54:56 2002
	72	@@ -120,10 +120,10 @@
1013231d AM	73	BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
	74
	75	# Where is the READLINE library? Typically in ../readline.
	76	-READLINE_DIR = ../readline
	77	-READLINE = $(READLINE_DIR)/libreadline.a
	78	-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
	79	-READLINE_CFLAGS = -I$(READLINE_SRC)/..
	80	+READLINE_DIR = /usr/include/readline
	81	+READLINE = -lreadline
	82	+READLINE_SRC = /usr/include/readline
	83	+READLINE_CFLAGS = -I/usr/include/readline
	84
	85	WARN_CFLAGS = @WARN_CFLAGS@
	86	WERROR_CFLAGS = @WERROR_CFLAGS@
5f1c61ac	87	diff -ur gdb-5.1.orig/gdb/defs.h gdb-5.1/gdb/defs.h
	88	--- gdb-5.1.orig/gdb/defs.h Thu Aug 2 23:36:51 2001
	89	+++ gdb-5.1/gdb/defs.h Tue Jan 22 23:59:50 2002
	90	@@ -800,7 +800,7 @@
	91
	92	/* From readline (but not in any readline .h files). */
	93
	94	-extern char tilde_expand (char );
	95	+extern char tilde_expand (const char );
	96
	97	/* Control types for commands */
	98
	99	diff -ur gdb-5.1.orig/gdb/event-top.c gdb-5.1/gdb/event-top.c
	100	--- gdb-5.1.orig/gdb/event-top.c Sat Jul 14 20:59:07 2001
	101	+++ gdb-5.1/gdb/event-top.c Tue Jan 22 23:59:50 2002
1013231d AM	102	@@ -32,6 +32,7 @@
	103	#include "gdbcmd.h"
	104
	105	/* readline include files */
	106	+#define savestring
	107	#include <readline/readline.h>
	108	#include <readline/history.h>
	109
5f1c61ac	110	diff -ur gdb-5.1.orig/gdb/gdbserver/Makefile.in gdb-5.1/gdb/gdbserver/Makefile.in
	111	--- gdb-5.1.orig/gdb/gdbserver/Makefile.in Tue Mar 6 09:21:43 2001
	112	+++ gdb-5.1/gdb/gdbserver/Makefile.in Tue Jan 22 23:59:50 2002
	113	@@ -88,7 +88,7 @@
1013231d AM	114
	115	# Where is the source dir for the READLINE library? Traditionally in .. or .
	116	# (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
	117	-READLINE_DIR = ${srcdir}/../readline
	118	+READLINE_DIR = /usr/lib
	119	READLINE_DEP = $$(READLINE_DIR)
	120
	121	# All the includes used for CFLAGS and for lint.
5f1c61ac	122	diff -ur gdb-5.1.orig/gdb/top.c gdb-5.1/gdb/top.c
	123	--- gdb-5.1.orig/gdb/top.c Sun Oct 21 21:41:19 2001
	124	+++ gdb-5.1/gdb/top.c Tue Jan 22 23:59:50 2002
	125	@@ -42,6 +42,7 @@
	126	#include "serial.h"
1013231d AM	127
	128	/* readline include files */
	129	+#define savestring
	130	#include <readline/readline.h>
	131	#include <readline/history.h>
	132
5f1c61ac	133	diff -ur gdb-5.1.orig/gdb/tracepoint.c gdb-5.1/gdb/tracepoint.c
	134	--- gdb-5.1.orig/gdb/tracepoint.c Thu Aug 2 14:05:57 2001
	135	+++ gdb-5.1/gdb/tracepoint.c Tue Jan 22 23:59:50 2002
	136	@@ -40,6 +40,7 @@
1013231d AM	137	#include "ax-gdb.h"
	138
	139	/* readline include files */
	140	+#define savestring
	141	#include <readline/readline.h>
	142	#include <readline/history.h>
	143
5f1c61ac	144	diff -ur gdb-5.1.orig/gdb/utils.c gdb-5.1/gdb/utils.c
	145	--- gdb-5.1.orig/gdb/utils.c Fri Nov 2 23:06:29 2001
	146	+++ gdb-5.1/gdb/utils.c Tue Jan 22 23:59:50 2002
	147	@@ -54,6 +54,7 @@
1013231d	148
5f1c61ac	149	#include "inferior.h" /* for signed_pointer_to_address */
1013231d AM	150
	151	+#define savestring
	152	#include <readline/readline.h>
	153
5f1c61ac	154	#ifndef MALLOC_INCOMPATIBLE