-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 @@
+--- gdb-6.7.org/gdb/Makefile.in 2007-09-05 02:14:02.000000000 +0200
++++ gdb-6.7/gdb/Makefile.in 2007-10-10 21:11:18.119976680 +0200
+@@ -126,11 +126,11 @@
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 = @READLINE@
+-READLINE_DEPS = @READLINE_DEPS@
+-READLINE_CFLAGS = @READLINE_CFLAGS@
+READLINE_DIR = /usr/include/readline
+READLINE = -lreadline
+READLINE_SRC = /usr/include/readline
++READLINE_DEPS =
+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
---- gdb-5.1.1/gdb/tui/tuiWin.c.orig Sat Jul 28 21:30:54 2001
-+++ gdb-5.1.1/gdb/tui/tuiWin.c Sat Feb 2 15:19:33 2002
-@@ -619,10 +619,10 @@
- tuiResizeAll (void)
- {
- int heightDiff, widthDiff;
-- extern int screenheight, screenwidth; /* in readline */
-+ extern int _rl_screenheight, _rl_screenwidth; /* in readline */
-
-- widthDiff = screenwidth - termWidth ();
-- heightDiff = screenheight - termHeight ();
-+ widthDiff = _rl_screenwidth - termWidth ();
-+ heightDiff = _rl_screenheight - termHeight ();
- if (heightDiff || widthDiff)
- {
- TuiLayoutType curLayout = currentLayout ();
-@@ -636,8 +636,8 @@
- if (winWithFocus != cmdWin)
- keypad (cmdWin->generic.handle, FALSE);
- init_page_info ();
-- setTermHeightTo (screenheight);
-- setTermWidthTo (screenwidth);
-+ setTermHeightTo (_rl_screenheight);
-+ setTermWidthTo (_rl_screenwidth);
- if (curLayout == SRC_DISASSEM_COMMAND ||
- curLayout == SRC_DATA_COMMAND || curLayout == DISASSEM_DATA_COMMAND)
- numWinsDisplayed++;
-@@ -664,8 +664,8 @@
- if (heightDiff == 0)
- newHeight = firstWin->generic.height;
- else if ((firstWin->generic.height + splitDiff) >=
-- (screenheight - MIN_CMD_WIN_HEIGHT - 1))
-- newHeight = screenheight - MIN_CMD_WIN_HEIGHT - 1;
-+ (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
-+ newHeight = _rl_screenheight - MIN_CMD_WIN_HEIGHT - 1;
- else if ((firstWin->generic.height + splitDiff) <= 0)
- newHeight = MIN_WIN_HEIGHT;
- else
-@@ -674,7 +674,7 @@
- _makeInvisibleAndSetNewHeight (firstWin, newHeight);
- cmdWin->generic.origin.y = locator->origin.y + 1;
- cmdWin->generic.width += widthDiff;
-- newHeight = screenheight - cmdWin->generic.origin.y;
-+ newHeight = _rl_screenheight - cmdWin->generic.origin.y;
- _makeInvisibleAndSetNewHeight (cmdWin, newHeight);
- _makeVisibleWithNewHeight (firstWin);
- _makeVisibleWithNewHeight (cmdWin);
-@@ -702,8 +702,8 @@
- newHeight = firstWin->generic.height;
- else if ((firstWin->generic.height +
- secondWin->generic.height + (splitDiff * 2)) >=
-- (screenheight - MIN_CMD_WIN_HEIGHT - 1))
-- newHeight = (screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
-+ (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
-+ newHeight = (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
- else if ((firstWin->generic.height + splitDiff) <= 0)
- newHeight = MIN_WIN_HEIGHT;
- else
-@@ -722,9 +722,9 @@
- newHeight = secondWin->generic.height;
- else if ((firstWin->generic.height +
- secondWin->generic.height + (splitDiff * 2)) >=
-- (screenheight - MIN_CMD_WIN_HEIGHT - 1))
-+ (_rl_screenheight - MIN_CMD_WIN_HEIGHT - 1))
- {
-- newHeight = screenheight - MIN_CMD_WIN_HEIGHT - 1;
-+ newHeight = _rl_screenheight - MIN_CMD_WIN_HEIGHT - 1;
- if (newHeight % 2)
- newHeight = (newHeight / 2) + 1;
- else
+ # Where is expat? This will be empty if expat was not available.
+ LIBEXPAT = @LIBEXPAT@
+@@ -416,7 +416,7 @@
+ $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
+ $(LIBICONV) $(LIBEXPAT) \
+ $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU)
+-CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \
++CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) \
+ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU)
+
+ ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
+--- gdb-7.4.50.20120120/Makefile.in.orig 2012-01-20 02:48:18.000000000 +0100
++++ gdb-7.4.50.20120120/Makefile.in 2012-03-17 10:35:14.194730128 +0100
+@@ -922,7 +922,6 @@
+ maybe-configure-libiberty \
+ maybe-configure-libiconv \
+ maybe-configure-m4 \
+- maybe-configure-readline \
+ maybe-configure-sid \
+ maybe-configure-sim \
+ maybe-configure-texinfo \
+@@ -1057,7 +1056,6 @@
+ @endif libiberty-no-bootstrap
+ all-host: maybe-all-libiconv
+ all-host: maybe-all-m4
+-all-host: maybe-all-readline
+ all-host: maybe-all-sid
+ all-host: maybe-all-sim
+ all-host: maybe-all-texinfo
+@@ -1149,7 +1147,6 @@
+ info-host: maybe-info-libiberty
+ info-host: maybe-info-libiconv
+ info-host: maybe-info-m4
+-info-host: maybe-info-readline
+ info-host: maybe-info-sid
+ info-host: maybe-info-sim
+ info-host: maybe-info-texinfo
+@@ -1226,7 +1223,6 @@
+ dvi-host: maybe-dvi-libiberty
+ dvi-host: maybe-dvi-libiconv
+ dvi-host: maybe-dvi-m4
+-dvi-host: maybe-dvi-readline
+ dvi-host: maybe-dvi-sid
+ dvi-host: maybe-dvi-sim
+ dvi-host: maybe-dvi-texinfo
+@@ -1303,7 +1299,6 @@
+ pdf-host: maybe-pdf-libiberty
+ pdf-host: maybe-pdf-libiconv
+ pdf-host: maybe-pdf-m4
+-pdf-host: maybe-pdf-readline
+ pdf-host: maybe-pdf-sid
+ pdf-host: maybe-pdf-sim
+ pdf-host: maybe-pdf-texinfo
+@@ -1380,7 +1375,6 @@
+ html-host: maybe-html-libiberty
+ html-host: maybe-html-libiconv
+ html-host: maybe-html-m4
+-html-host: maybe-html-readline
+ html-host: maybe-html-sid
+ html-host: maybe-html-sim
+ html-host: maybe-html-texinfo
+@@ -1457,7 +1451,6 @@
+ TAGS-host: maybe-TAGS-libiberty
+ TAGS-host: maybe-TAGS-libiconv
+ TAGS-host: maybe-TAGS-m4
+-TAGS-host: maybe-TAGS-readline
+ TAGS-host: maybe-TAGS-sid
+ TAGS-host: maybe-TAGS-sim
+ TAGS-host: maybe-TAGS-texinfo
+@@ -1534,7 +1527,6 @@
+ install-info-host: maybe-install-info-libiberty
+ install-info-host: maybe-install-info-libiconv
+ install-info-host: maybe-install-info-m4
+-install-info-host: maybe-install-info-readline
+ install-info-host: maybe-install-info-sid
+ install-info-host: maybe-install-info-sim
+ install-info-host: maybe-install-info-texinfo
+@@ -1611,7 +1603,6 @@
+ install-pdf-host: maybe-install-pdf-libiberty
+ install-pdf-host: maybe-install-pdf-libiconv
+ install-pdf-host: maybe-install-pdf-m4
+-install-pdf-host: maybe-install-pdf-readline
+ install-pdf-host: maybe-install-pdf-sid
+ install-pdf-host: maybe-install-pdf-sim
+ install-pdf-host: maybe-install-pdf-texinfo
+@@ -1688,7 +1679,6 @@
+ install-html-host: maybe-install-html-libiberty
+ install-html-host: maybe-install-html-libiconv
+ install-html-host: maybe-install-html-m4
+-install-html-host: maybe-install-html-readline
+ install-html-host: maybe-install-html-sid
+ install-html-host: maybe-install-html-sim
+ install-html-host: maybe-install-html-texinfo
+@@ -1765,7 +1755,6 @@
+ installcheck-host: maybe-installcheck-libiberty
+ installcheck-host: maybe-installcheck-libiconv
+ installcheck-host: maybe-installcheck-m4
+-installcheck-host: maybe-installcheck-readline
+ installcheck-host: maybe-installcheck-sid
+ installcheck-host: maybe-installcheck-sim
+ installcheck-host: maybe-installcheck-texinfo
+@@ -1842,7 +1831,6 @@
+ mostlyclean-host: maybe-mostlyclean-libiberty
+ mostlyclean-host: maybe-mostlyclean-libiconv
+ mostlyclean-host: maybe-mostlyclean-m4
+-mostlyclean-host: maybe-mostlyclean-readline
+ mostlyclean-host: maybe-mostlyclean-sid
+ mostlyclean-host: maybe-mostlyclean-sim
+ mostlyclean-host: maybe-mostlyclean-texinfo
+@@ -1919,7 +1907,6 @@
+ clean-host: maybe-clean-libiberty
+ clean-host: maybe-clean-libiconv
+ clean-host: maybe-clean-m4
+-clean-host: maybe-clean-readline
+ clean-host: maybe-clean-sid
+ clean-host: maybe-clean-sim
+ clean-host: maybe-clean-texinfo
+@@ -1996,7 +1983,6 @@
+ distclean-host: maybe-distclean-libiberty
+ distclean-host: maybe-distclean-libiconv
+ distclean-host: maybe-distclean-m4
+-distclean-host: maybe-distclean-readline
+ distclean-host: maybe-distclean-sid
+ distclean-host: maybe-distclean-sim
+ distclean-host: maybe-distclean-texinfo
+@@ -2073,7 +2059,6 @@
+ maintainer-clean-host: maybe-maintainer-clean-libiberty
+ maintainer-clean-host: maybe-maintainer-clean-libiconv
+ maintainer-clean-host: maybe-maintainer-clean-m4
+-maintainer-clean-host: maybe-maintainer-clean-readline
+ maintainer-clean-host: maybe-maintainer-clean-sid
+ maintainer-clean-host: maybe-maintainer-clean-sim
+ maintainer-clean-host: maybe-maintainer-clean-texinfo
+@@ -2205,7 +2190,6 @@
+ maybe-check-libiberty \
+ maybe-check-libiconv \
+ maybe-check-m4 \
+- maybe-check-readline \
+ maybe-check-sid \
+ maybe-check-sim \
+ maybe-check-texinfo \
+@@ -2308,7 +2292,6 @@
+ maybe-install-libiberty \
+ maybe-install-libiconv \
+ maybe-install-m4 \
+- maybe-install-readline \
+ maybe-install-sid \
+ maybe-install-sim \
+ maybe-install-texinfo \
+@@ -2354,7 +2337,6 @@
+ maybe-install-libiberty \
+ maybe-install-libiconv \
+ maybe-install-m4 \
+- maybe-install-readline \
+ maybe-install-sid \
+ maybe-install-sim \
+ maybe-install-texinfo \
+@@ -2450,7 +2432,6 @@
+ maybe-install-strip-libiberty \
+ maybe-install-strip-libiconv \
+ maybe-install-strip-m4 \
+- maybe-install-strip-readline \
+ maybe-install-strip-sid \
+ maybe-install-strip-sim \
+ maybe-install-strip-texinfo \
+@@ -42608,7 +42589,6 @@
+ all-gdb: maybe-all-libiberty
+ all-gdb: maybe-all-libiconv
+ all-gdb: maybe-all-opcodes
+-all-gdb: maybe-all-readline
+ all-gdb: maybe-all-build-bison
+ all-gdb: maybe-all-sim
+ all-gdb: maybe-all-libdecnumber
+@@ -42946,7 +42926,6 @@
+ all-sim: maybe-all-libiberty
+ all-sim: maybe-all-bfd
+ all-sim: maybe-all-opcodes
+-all-sim: maybe-all-readline
+ all-sim: maybe-configure-gdb
+ all-fastjar: maybe-all-zlib
+ all-fastjar: maybe-all-build-texinfo
projects / packages / gdb.git / blobdiff