]> git.pld-linux.org Git - packages/gdb.git/blame - gdb-readline.patch
- Release: 1 (no comment/changelog entry seems to justify release<1)
[packages/gdb.git] / gdb-readline.patch
CommitLineData
8ef65460
AM
1diff -urN gdb-6.0.org/gdb/event-top.c gdb-6.0/gdb/event-top.c
2--- gdb-6.0.org/gdb/event-top.c 2003-10-09 19:42:39.000000000 +0200
3+++ gdb-6.0/gdb/event-top.c 2003-10-09 19:48:08.000000000 +0200
4@@ -33,6 +33,7 @@
5 #include "gdbcmd.h"
6
7 /* readline include files */
8+#define savestring
9 #include <readline/readline.h>
10 #include <readline/history.h>
11
12diff -urN gdb-6.0.org/gdb/gdbserver/Makefile.in gdb-6.0/gdb/gdbserver/Makefile.in
13--- gdb-6.0.org/gdb/gdbserver/Makefile.in 2003-10-09 19:42:41.000000000 +0200
14+++ gdb-6.0/gdb/gdbserver/Makefile.in 2003-10-09 19:48:08.000000000 +0200
15@@ -76,7 +76,7 @@
16
17 # Where is the source dir for the READLINE library? Traditionally in .. or .
18 # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
19-READLINE_DIR = ${srcdir}/../readline
20+READLINE_DIR = /usr/lib
21 READLINE_DEP = $$(READLINE_DIR)
22
23 # All the includes used for CFLAGS and for lint.
24diff -urN gdb-6.0.org/gdb/Makefile.in gdb-6.0/gdb/Makefile.in
25--- gdb-6.0.org/gdb/Makefile.in 2003-10-09 19:42:39.000000000 +0200
26+++ gdb-6.0/gdb/Makefile.in 2003-10-09 19:48:08.000000000 +0200
27@@ -116,10 +116,10 @@
1013231d
AM
28 BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
29
30 # Where is the READLINE library? Typically in ../readline.
31-READLINE_DIR = ../readline
32-READLINE = $(READLINE_DIR)/libreadline.a
33-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
34-READLINE_CFLAGS = -I$(READLINE_SRC)/..
35+READLINE_DIR = /usr/include/readline
36+READLINE = -lreadline
37+READLINE_SRC = /usr/include/readline
38+READLINE_CFLAGS = -I/usr/include/readline
39
40 WARN_CFLAGS = @WARN_CFLAGS@
41 WERROR_CFLAGS = @WERROR_CFLAGS@
8ef65460
AM
42diff -urN gdb-6.0.org/gdb/top.c gdb-6.0/gdb/top.c
43--- gdb-6.0.org/gdb/top.c 2003-10-09 19:42:40.000000000 +0200
44+++ gdb-6.0/gdb/top.c 2003-10-09 19:48:08.000000000 +0200
45@@ -47,6 +47,7 @@
46 #include "gdb_assert.h"
1013231d
AM
47
48 /* readline include files */
49+#define savestring
50 #include <readline/readline.h>
51 #include <readline/history.h>
52
8ef65460
AM
53diff -urN gdb-6.0.org/gdb/tracepoint.c gdb-6.0/gdb/tracepoint.c
54--- gdb-6.0.org/gdb/tracepoint.c 2003-10-09 19:42:40.000000000 +0200
55+++ gdb-6.0/gdb/tracepoint.c 2003-10-09 19:48:08.000000000 +0200
56@@ -44,6 +44,7 @@
57 #include "ax-gdb.h"
1013231d
AM
58
59 /* readline include files */
60+#define savestring
61 #include <readline/readline.h>
62 #include <readline/history.h>
63
8ef65460
AM
64diff -urN gdb-6.0.org/gdb/utils.c gdb-6.0/gdb/utils.c
65--- gdb-6.0.org/gdb/utils.c 2003-10-09 19:42:40.000000000 +0200
66+++ gdb-6.0/gdb/utils.c 2003-10-09 19:48:08.000000000 +0200
67@@ -59,6 +59,7 @@
68 #include <term.h>
69 #endif
1013231d 70
1013231d
AM
71+#define savestring
72 #include <readline/readline.h>
1013231d 73
8ef65460
AM
74 #ifdef USE_MMALLOC
75diff -urN gdb-6.0.org/Makefile.in gdb-6.0/Makefile.in
76--- gdb-6.0.org/Makefile.in 2003-10-09 19:42:43.000000000 +0200
77+++ gdb-6.0/Makefile.in 2003-10-09 19:52:00.000000000 +0200
78@@ -581,7 +581,6 @@
79 maybe-configure-perl \
80 maybe-configure-prms \
81 maybe-configure-rcs \
82- maybe-configure-readline \
83 maybe-configure-release \
84 maybe-configure-recode \
85 maybe-configure-sed \
86@@ -670,7 +669,6 @@
87 maybe-all-perl \
88 maybe-all-prms \
89 maybe-all-rcs \
90- maybe-all-readline \
91 maybe-all-release \
92 maybe-all-recode \
93 maybe-all-sed \
94@@ -763,7 +761,6 @@
95 maybe-info-perl \
96 maybe-info-prms \
97 maybe-info-rcs \
98- maybe-info-readline \
99 maybe-info-release \
100 maybe-info-recode \
101 maybe-info-sed \
102@@ -1731,28 +1728,6 @@
103 || exit 1
1013231d 104
1013231d 105
8ef65460
AM
106-.PHONY: maybe-info-readline info-readline
107-maybe-info-readline:
108-
109-info-readline: \
110- configure-readline
111- @[ -f ./readline/Makefile ] || exit 0; \
112- r=`${PWD}`; export r; \
113- s=`cd $(srcdir); ${PWD}`; export s; \
114- $(SET_LIB_PATH) \
115- for flag in $(EXTRA_HOST_FLAGS); do \
116- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
117- done; \
118- echo "Doing info in readline" ; \
119- (cd readline && \
120- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
121- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
122- "RANLIB=$${RANLIB}" \
123- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
124- info) \
125- || exit 1
126-
127-
128 .PHONY: maybe-info-release info-release
129 maybe-info-release:
130
131@@ -2639,7 +2614,6 @@
132 maybe-dvi-perl \
133 maybe-dvi-prms \
134 maybe-dvi-rcs \
135- maybe-dvi-readline \
136 maybe-dvi-release \
137 maybe-dvi-recode \
138 maybe-dvi-sed \
139@@ -3607,28 +3581,6 @@
140 || exit 1
141
142
143-.PHONY: maybe-dvi-readline dvi-readline
144-maybe-dvi-readline:
145-
146-dvi-readline: \
147- configure-readline
148- @[ -f ./readline/Makefile ] || exit 0; \
149- r=`${PWD}`; export r; \
150- s=`cd $(srcdir); ${PWD}`; export s; \
151- $(SET_LIB_PATH) \
152- for flag in $(EXTRA_HOST_FLAGS); do \
153- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
154- done; \
155- echo "Doing dvi in readline" ; \
156- (cd readline && \
157- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
158- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
159- "RANLIB=$${RANLIB}" \
160- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
161- dvi) \
162- || exit 1
163-
164-
165 .PHONY: maybe-dvi-release dvi-release
166 maybe-dvi-release:
167
168@@ -4515,7 +4467,6 @@
169 maybe-TAGS-perl \
170 maybe-TAGS-prms \
171 maybe-TAGS-rcs \
172- maybe-TAGS-readline \
173 maybe-TAGS-release \
174 maybe-TAGS-recode \
175 maybe-TAGS-sed \
176@@ -5483,28 +5434,6 @@
177 || exit 1
178
179
180-.PHONY: maybe-TAGS-readline TAGS-readline
181-maybe-TAGS-readline:
182-
183-TAGS-readline: \
184- configure-readline
185- @[ -f ./readline/Makefile ] || exit 0; \
186- r=`${PWD}`; export r; \
187- s=`cd $(srcdir); ${PWD}`; export s; \
188- $(SET_LIB_PATH) \
189- for flag in $(EXTRA_HOST_FLAGS); do \
190- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
191- done; \
192- echo "Doing TAGS in readline" ; \
193- (cd readline && \
194- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
195- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
196- "RANLIB=$${RANLIB}" \
197- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
198- TAGS) \
199- || exit 1
200-
201-
202 .PHONY: maybe-TAGS-release TAGS-release
203 maybe-TAGS-release:
204
205@@ -6391,7 +6320,6 @@
206 maybe-install-info-perl \
207 maybe-install-info-prms \
208 maybe-install-info-rcs \
209- maybe-install-info-readline \
210 maybe-install-info-release \
211 maybe-install-info-recode \
212 maybe-install-info-sed \
213@@ -7401,29 +7329,6 @@
214 || exit 1
215
216
217-.PHONY: maybe-install-info-readline install-info-readline
218-maybe-install-info-readline:
219-
220-install-info-readline: \
221- configure-readline \
222- info-readline
223- @[ -f ./readline/Makefile ] || exit 0; \
224- r=`${PWD}`; export r; \
225- s=`cd $(srcdir); ${PWD}`; export s; \
226- $(SET_LIB_PATH) \
227- for flag in $(EXTRA_HOST_FLAGS); do \
228- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
229- done; \
230- echo "Doing install-info in readline" ; \
231- (cd readline && \
232- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
233- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
234- "RANLIB=$${RANLIB}" \
235- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
236- install-info) \
237- || exit 1
238-
239-
240 .PHONY: maybe-install-info-release install-info-release
241 maybe-install-info-release:
242
243@@ -8348,7 +8253,6 @@
244 maybe-installcheck-perl \
245 maybe-installcheck-prms \
246 maybe-installcheck-rcs \
247- maybe-installcheck-readline \
248 maybe-installcheck-release \
249 maybe-installcheck-recode \
250 maybe-installcheck-sed \
251@@ -9316,28 +9220,6 @@
252 || exit 1
253
254
255-.PHONY: maybe-installcheck-readline installcheck-readline
256-maybe-installcheck-readline:
257-
258-installcheck-readline: \
259- configure-readline
260- @[ -f ./readline/Makefile ] || exit 0; \
261- r=`${PWD}`; export r; \
262- s=`cd $(srcdir); ${PWD}`; export s; \
263- $(SET_LIB_PATH) \
264- for flag in $(EXTRA_HOST_FLAGS); do \
265- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
266- done; \
267- echo "Doing installcheck in readline" ; \
268- (cd readline && \
269- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
270- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
271- "RANLIB=$${RANLIB}" \
272- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
273- installcheck) \
274- || exit 1
275-
276-
277 .PHONY: maybe-installcheck-release installcheck-release
278 maybe-installcheck-release:
279
280@@ -10224,7 +10106,6 @@
281 maybe-mostlyclean-perl \
282 maybe-mostlyclean-prms \
283 maybe-mostlyclean-rcs \
284- maybe-mostlyclean-readline \
285 maybe-mostlyclean-release \
286 maybe-mostlyclean-recode \
287 maybe-mostlyclean-sed \
288@@ -11136,27 +11017,6 @@
289 || exit 1
290
291
292-.PHONY: maybe-mostlyclean-readline mostlyclean-readline
293-maybe-mostlyclean-readline:
294-
295-mostlyclean-readline:
296- @[ -f ./readline/Makefile ] || exit 0; \
297- r=`${PWD}`; export r; \
298- s=`cd $(srcdir); ${PWD}`; export s; \
299- $(SET_LIB_PATH) \
300- for flag in $(EXTRA_HOST_FLAGS); do \
301- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
302- done; \
303- echo "Doing mostlyclean in readline" ; \
304- (cd readline && \
305- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
306- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
307- "RANLIB=$${RANLIB}" \
308- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
309- mostlyclean) \
310- || exit 1
311-
312-
313 .PHONY: maybe-mostlyclean-release mostlyclean-release
314 maybe-mostlyclean-release:
315
316@@ -11977,7 +11837,6 @@
317 maybe-clean-perl \
318 maybe-clean-prms \
319 maybe-clean-rcs \
320- maybe-clean-readline \
321 maybe-clean-release \
322 maybe-clean-recode \
323 maybe-clean-sed \
324@@ -12903,27 +12762,6 @@
325 || exit 1
326
327
328-.PHONY: maybe-clean-readline clean-readline
329-maybe-clean-readline:
330-
331-clean-readline:
332- @[ -f ./readline/Makefile ] || exit 0; \
333- r=`${PWD}`; export r; \
334- s=`cd $(srcdir); ${PWD}`; export s; \
335- $(SET_LIB_PATH) \
336- for flag in $(EXTRA_HOST_FLAGS); do \
337- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
338- done; \
339- echo "Doing clean in readline" ; \
340- (cd readline && \
341- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
342- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
343- "RANLIB=$${RANLIB}" \
344- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
345- clean) \
346- || exit 1
347-
348-
349 .PHONY: maybe-clean-release clean-release
350 maybe-clean-release:
351
352@@ -13744,7 +13582,6 @@
353 maybe-distclean-perl \
354 maybe-distclean-prms \
355 maybe-distclean-rcs \
356- maybe-distclean-readline \
357 maybe-distclean-release \
358 maybe-distclean-recode \
359 maybe-distclean-sed \
360@@ -14670,27 +14507,6 @@
361 || exit 1
362
363
364-.PHONY: maybe-distclean-readline distclean-readline
365-maybe-distclean-readline:
366-
367-distclean-readline:
368- @[ -f ./readline/Makefile ] || exit 0; \
369- r=`${PWD}`; export r; \
370- s=`cd $(srcdir); ${PWD}`; export s; \
371- $(SET_LIB_PATH) \
372- for flag in $(EXTRA_HOST_FLAGS); do \
373- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
374- done; \
375- echo "Doing distclean in readline" ; \
376- (cd readline && \
377- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
378- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
379- "RANLIB=$${RANLIB}" \
380- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
381- distclean) \
382- || exit 1
383-
384-
385 .PHONY: maybe-distclean-release distclean-release
386 maybe-distclean-release:
387
388@@ -15511,7 +15327,6 @@
389 maybe-maintainer-clean-perl \
390 maybe-maintainer-clean-prms \
391 maybe-maintainer-clean-rcs \
392- maybe-maintainer-clean-readline \
393 maybe-maintainer-clean-release \
394 maybe-maintainer-clean-recode \
395 maybe-maintainer-clean-sed \
396@@ -16437,27 +16252,6 @@
397 || exit 1
398
399
400-.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
401-maybe-maintainer-clean-readline:
402-
403-maintainer-clean-readline:
404- @[ -f ./readline/Makefile ] || exit 0; \
405- r=`${PWD}`; export r; \
406- s=`cd $(srcdir); ${PWD}`; export s; \
407- $(SET_LIB_PATH) \
408- for flag in $(EXTRA_HOST_FLAGS); do \
409- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
410- done; \
411- echo "Doing maintainer-clean in readline" ; \
412- (cd readline && \
413- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
414- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
415- "RANLIB=$${RANLIB}" \
416- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
417- maintainer-clean) \
418- || exit 1
419-
420-
421 .PHONY: maybe-maintainer-clean-release maintainer-clean-release
422 maybe-maintainer-clean-release:
423
424@@ -17336,7 +17130,6 @@
425 maybe-check-perl \
426 maybe-check-prms \
427 maybe-check-rcs \
428- maybe-check-readline \
429 maybe-check-release \
430 maybe-check-recode \
431 maybe-check-sed \
432@@ -17445,7 +17238,6 @@
433 maybe-install-perl \
434 maybe-install-prms \
435 maybe-install-rcs \
436- maybe-install-readline \
437 maybe-install-release \
438 maybe-install-recode \
439 maybe-install-sed \
440@@ -17512,7 +17304,6 @@
441 maybe-install-perl \
442 maybe-install-prms \
443 maybe-install-rcs \
444- maybe-install-readline \
445 maybe-install-release \
446 maybe-install-recode \
447 maybe-install-sed \
448@@ -20393,72 +20184,6 @@
449 (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install)
450
1013231d 451
8ef65460
AM
452-.PHONY: configure-readline maybe-configure-readline
453-maybe-configure-readline:
454-configure-readline:
455- @test ! -f readline/Makefile || exit 0; \
456- [ -d readline ] || mkdir readline; \
457- r=`${PWD}`; export r; \
458- s=`cd $(srcdir); ${PWD}`; export s; \
459- CC="$(CC)"; export CC; \
460- CFLAGS="$(CFLAGS)"; export CFLAGS; \
461- CXX="$(CXX)"; export CXX; \
462- CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
463- AR="$(AR)"; export AR; \
464- AS="$(AS)"; export AS; \
465- CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
466- DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
467- LD="$(LD)"; export LD; \
468- NM="$(NM)"; export NM; \
469- RANLIB="$(RANLIB)"; export RANLIB; \
470- WINDRES="$(WINDRES)"; export WINDRES; \
471- OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
472- OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
473- echo Configuring in readline; \
474- cd readline || exit 1; \
475- case $(srcdir) in \
476- \.) \
477- srcdiroption="--srcdir=."; \
478- libsrcdir=".";; \
479- /* | [A-Za-z]:[\\/]*) \
480- srcdiroption="--srcdir=$(srcdir)/readline"; \
481- libsrcdir="$$s/readline";; \
482- *) \
483- srcdiroption="--srcdir=../$(srcdir)/readline"; \
484- libsrcdir="$$s/readline";; \
485- esac; \
486- $(SHELL) $${libsrcdir}/configure \
487- $(HOST_CONFIGARGS) $${srcdiroption} \
488- || exit 1
489-
490-.PHONY: all-readline maybe-all-readline
491-maybe-all-readline:
492-all-readline: configure-readline
493- @r=`${PWD}`; export r; \
494- s=`cd $(srcdir); ${PWD}`; export s; \
495- $(SET_LIB_PATH) \
496- (cd readline && $(MAKE) $(FLAGS_TO_PASS) all)
497-
498-.PHONY: check-readline maybe-check-readline
499-maybe-check-readline:
500-
501-check-readline:
502- @r=`${PWD}`; export r; \
503- s=`cd $(srcdir); ${PWD}`; export s; \
504- $(SET_LIB_PATH) \
505- (cd readline && $(MAKE) $(FLAGS_TO_PASS) check)
506-
507-
508-.PHONY: install-readline maybe-install-readline
509-maybe-install-readline:
510-
511-install-readline: installdirs
512- @r=`${PWD}`; export r; \
513- s=`cd $(srcdir); ${PWD}`; export s; \
514- $(SET_LIB_PATH) \
515- (cd readline && $(MAKE) $(FLAGS_TO_PASS) install)
516-
517-
518 .PHONY: configure-release maybe-configure-release
519 maybe-configure-release:
520 configure-release:
521@@ -23750,7 +23475,7 @@
522 # GDB needs to know that the simulator is being built.
523 configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim
524 GDB_TK = @GDB_TK@
525-all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
526+all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
527 install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
528 configure-libgui: maybe-configure-tcl maybe-configure-tk
529 all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
530@@ -23781,7 +23506,7 @@
531 install-itcl: maybe-install-tcl
532 all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk
533 install-sid: maybe-install-tcl maybe-install-tk
534-all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb
535+all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-configure-gdb
536 configure-tk: maybe-configure-tcl
537 all-tk: maybe-all-tcl
538 configure-tix: maybe-configure-tcl maybe-configure-tk
This page took 0.140978 seconds and 4 git commands to generate.