]> git.pld-linux.org Git - packages/gdb.git/blobdiff - gdb-readline.patch
- updated to 14.1 + rebased Fedora buildid patches set
[packages/gdb.git] / gdb-readline.patch
index 4022b63e343a37575c534bcc6418ab3eb46d5326..2bd4c77ef250375a8b5a066e472112e5d8684b50 100644 (file)
@@ -1,11 +1,10 @@
-diff -ur gdb-6.7.org/gdb/Makefile.in gdb-6.7/gdb/Makefile.in
---- 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)
+--- gdb-14.1/gdb/Makefile.in.orig      2022-06-23 22:08:57.971168251 +0200
++++ gdb-14.1/gdb/Makefile.in   2022-06-23 22:15:34.112355503 +0200
+@@ -180,11 +180,11 @@ LIBDECNUMBER_SRC = $(srcdir)/$(LIBDECNUM
+ LIBDECNUMBER_CFLAGS = -I$(LIBDECNUMBER_DIR) -I$(LIBDECNUMBER_SRC)
  
- # Where is the READLINE library?  Typically in ../readline.
--READLINE_DIR = ../readline
+ # Where is the READLINE library?  Typically in ../readline/readline.
+-READLINE_DIR = ../readline/readline
 -READLINE_SRC = $(srcdir)/$(READLINE_DIR)
 -READLINE = @READLINE@
 -READLINE_DEPS = @READLINE_DEPS@
@@ -18,194 +17,181 @@ diff -ur gdb-6.7.org/gdb/Makefile.in gdb-6.7/gdb/Makefile.in
  
  # 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)
-diff -ur gdb-6.7.org/Makefile.in gdb-6.7/Makefile.in
---- gdb-6.7.org/Makefile.in    2007-10-10 19:09:32.000000000 +0200
-+++ gdb-6.7/Makefile.in        2007-10-10 21:10:23.310556251 +0200
-@@ -664,7 +664,6 @@
-     maybe-configure-perl \
-     maybe-configure-prms \
-     maybe-configure-rcs \
+--- gdb-12.1/Makefile.in.orig  2022-05-01 20:47:43.000000000 +0200
++++ gdb-12.1/Makefile.in       2022-06-23 22:06:05.298770364 +0200
+@@ -1087,7 +1087,6 @@ configure-host:  \
+     maybe-configure-libiberty-linker-plugin \
+     maybe-configure-libiconv \
+     maybe-configure-m4 \
 -    maybe-configure-readline \
-     maybe-configure-release \
-     maybe-configure-recode \
-     maybe-configure-sed \
-@@ -812,7 +811,6 @@
- all-host: maybe-all-perl
- all-host: maybe-all-prms
- all-host: maybe-all-rcs
+     maybe-configure-sid \
+     maybe-configure-sim \
+     maybe-configure-texinfo \
+@@ -1261,7 +1260,6 @@ all-host: maybe-all-libiberty-linker-plu
+ all-host: maybe-all-libiconv
+ @endif libiconv-no-bootstrap
+ all-host: maybe-all-m4
 -all-host: maybe-all-readline
- all-host: maybe-all-release
- all-host: maybe-all-recode
- all-host: maybe-all-sed
-@@ -927,7 +925,6 @@
- info-host: maybe-info-perl
- info-host: maybe-info-prms
- info-host: maybe-info-rcs
+ all-host: maybe-all-sid
+ all-host: maybe-all-sim
+ all-host: maybe-all-texinfo
+@@ -1373,7 +1371,6 @@ info-host: maybe-info-libiberty
+ info-host: maybe-info-libiberty-linker-plugin
+ info-host: maybe-info-libiconv
+ info-host: maybe-info-m4
 -info-host: maybe-info-readline
- info-host: maybe-info-release
- info-host: maybe-info-recode
- info-host: maybe-info-sed
-@@ -1033,7 +1030,6 @@
- dvi-host: maybe-dvi-perl
- dvi-host: maybe-dvi-prms
- dvi-host: maybe-dvi-rcs
+ info-host: maybe-info-sid
+ info-host: maybe-info-sim
+ info-host: maybe-info-texinfo
+@@ -1464,7 +1461,6 @@ dvi-host: maybe-dvi-libiberty
+ dvi-host: maybe-dvi-libiberty-linker-plugin
+ dvi-host: maybe-dvi-libiconv
+ dvi-host: maybe-dvi-m4
 -dvi-host: maybe-dvi-readline
- dvi-host: maybe-dvi-release
- dvi-host: maybe-dvi-recode
- dvi-host: maybe-dvi-sed
-@@ -1245,7 +1241,6 @@
- html-host: maybe-html-perl
- html-host: maybe-html-prms
- html-host: maybe-html-rcs
+ dvi-host: maybe-dvi-sid
+ dvi-host: maybe-dvi-sim
+ dvi-host: maybe-dvi-texinfo
+@@ -1555,7 +1551,6 @@ pdf-host: maybe-pdf-libiberty
+ pdf-host: maybe-pdf-libiberty-linker-plugin
+ 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
+@@ -1646,7 +1641,6 @@ html-host: maybe-html-libiberty
+ html-host: maybe-html-libiberty-linker-plugin
+ html-host: maybe-html-libiconv
+ html-host: maybe-html-m4
 -html-host: maybe-html-readline
- html-host: maybe-html-release
- html-host: maybe-html-recode
- html-host: maybe-html-sed
-@@ -1351,7 +1346,6 @@
- TAGS-host: maybe-TAGS-perl
- TAGS-host: maybe-TAGS-prms
- TAGS-host: maybe-TAGS-rcs
+ html-host: maybe-html-sid
+ html-host: maybe-html-sim
+ html-host: maybe-html-texinfo
+@@ -1737,7 +1731,6 @@ TAGS-host: maybe-TAGS-libiberty
+ TAGS-host: maybe-TAGS-libiberty-linker-plugin
+ TAGS-host: maybe-TAGS-libiconv
+ TAGS-host: maybe-TAGS-m4
 -TAGS-host: maybe-TAGS-readline
- TAGS-host: maybe-TAGS-release
- TAGS-host: maybe-TAGS-recode
- TAGS-host: maybe-TAGS-sed
-@@ -1457,7 +1451,6 @@
- install-info-host: maybe-install-info-perl
- install-info-host: maybe-install-info-prms
- install-info-host: maybe-install-info-rcs
+ TAGS-host: maybe-TAGS-sid
+ TAGS-host: maybe-TAGS-sim
+ TAGS-host: maybe-TAGS-texinfo
+@@ -1828,7 +1821,6 @@ install-info-host: maybe-install-info-li
+ install-info-host: maybe-install-info-libiberty-linker-plugin
+ 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-release
- install-info-host: maybe-install-info-recode
- install-info-host: maybe-install-info-sed
-@@ -1669,7 +1662,6 @@
- install-html-host: maybe-install-html-perl
- install-html-host: maybe-install-html-prms
- install-html-host: maybe-install-html-rcs
+ install-info-host: maybe-install-info-sid
+ install-info-host: maybe-install-info-sim
+ install-info-host: maybe-install-info-texinfo
+@@ -1919,7 +1911,6 @@ install-dvi-host: maybe-install-dvi-libi
+ install-dvi-host: maybe-install-dvi-libiberty-linker-plugin
+ install-dvi-host: maybe-install-dvi-libiconv
+ install-dvi-host: maybe-install-dvi-m4
+-install-dvi-host: maybe-install-dvi-readline
+ install-dvi-host: maybe-install-dvi-sid
+ install-dvi-host: maybe-install-dvi-sim
+ install-dvi-host: maybe-install-dvi-texinfo
+@@ -2010,7 +2001,6 @@ install-pdf-host: maybe-install-pdf-libi
+ install-pdf-host: maybe-install-pdf-libiberty-linker-plugin
+ 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
+@@ -2101,7 +2091,6 @@ install-html-host: maybe-install-html-li
+ install-html-host: maybe-install-html-libiberty-linker-plugin
+ 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-release
- install-html-host: maybe-install-html-recode
- install-html-host: maybe-install-html-sed
-@@ -1775,7 +1767,6 @@
- installcheck-host: maybe-installcheck-perl
- installcheck-host: maybe-installcheck-prms
- installcheck-host: maybe-installcheck-rcs
+ install-html-host: maybe-install-html-sid
+ install-html-host: maybe-install-html-sim
+ install-html-host: maybe-install-html-texinfo
+@@ -2192,7 +2181,6 @@ installcheck-host: maybe-installcheck-li
+ installcheck-host: maybe-installcheck-libiberty-linker-plugin
+ installcheck-host: maybe-installcheck-libiconv
+ installcheck-host: maybe-installcheck-m4
 -installcheck-host: maybe-installcheck-readline
- installcheck-host: maybe-installcheck-release
- installcheck-host: maybe-installcheck-recode
- installcheck-host: maybe-installcheck-sed
-@@ -1881,7 +1872,6 @@
- mostlyclean-host: maybe-mostlyclean-perl
- mostlyclean-host: maybe-mostlyclean-prms
- mostlyclean-host: maybe-mostlyclean-rcs
+ installcheck-host: maybe-installcheck-sid
+ installcheck-host: maybe-installcheck-sim
+ installcheck-host: maybe-installcheck-texinfo
+@@ -2283,7 +2271,6 @@ mostlyclean-host: maybe-mostlyclean-libi
+ mostlyclean-host: maybe-mostlyclean-libiberty-linker-plugin
+ mostlyclean-host: maybe-mostlyclean-libiconv
+ mostlyclean-host: maybe-mostlyclean-m4
 -mostlyclean-host: maybe-mostlyclean-readline
- mostlyclean-host: maybe-mostlyclean-release
- mostlyclean-host: maybe-mostlyclean-recode
- mostlyclean-host: maybe-mostlyclean-sed
-@@ -1987,7 +1977,6 @@
- clean-host: maybe-clean-perl
- clean-host: maybe-clean-prms
- clean-host: maybe-clean-rcs
+ mostlyclean-host: maybe-mostlyclean-sid
+ mostlyclean-host: maybe-mostlyclean-sim
+ mostlyclean-host: maybe-mostlyclean-texinfo
+@@ -2374,7 +2361,6 @@ clean-host: maybe-clean-libiberty
+ clean-host: maybe-clean-libiberty-linker-plugin
+ clean-host: maybe-clean-libiconv
+ clean-host: maybe-clean-m4
 -clean-host: maybe-clean-readline
- clean-host: maybe-clean-release
- clean-host: maybe-clean-recode
- clean-host: maybe-clean-sed
-@@ -2093,7 +2082,6 @@
- distclean-host: maybe-distclean-perl
- distclean-host: maybe-distclean-prms
- distclean-host: maybe-distclean-rcs
+ clean-host: maybe-clean-sid
+ clean-host: maybe-clean-sim
+ clean-host: maybe-clean-texinfo
+@@ -2465,7 +2451,6 @@ distclean-host: maybe-distclean-libibert
+ distclean-host: maybe-distclean-libiberty-linker-plugin
+ distclean-host: maybe-distclean-libiconv
+ distclean-host: maybe-distclean-m4
 -distclean-host: maybe-distclean-readline
- distclean-host: maybe-distclean-release
- distclean-host: maybe-distclean-recode
- distclean-host: maybe-distclean-sed
-@@ -2199,7 +2187,6 @@
- maintainer-clean-host: maybe-maintainer-clean-perl
- maintainer-clean-host: maybe-maintainer-clean-prms
- maintainer-clean-host: maybe-maintainer-clean-rcs
+ distclean-host: maybe-distclean-sid
+ distclean-host: maybe-distclean-sim
+ distclean-host: maybe-distclean-texinfo
+@@ -2556,7 +2541,6 @@ maintainer-clean-host: maybe-maintainer-
+ maintainer-clean-host: maybe-maintainer-clean-libiberty-linker-plugin
+ 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-release
- maintainer-clean-host: maybe-maintainer-clean-recode
- maintainer-clean-host: maybe-maintainer-clean-sed
-@@ -2359,7 +2346,6 @@
-     maybe-check-perl \
-     maybe-check-prms \
-     maybe-check-rcs \
+ maintainer-clean-host: maybe-maintainer-clean-sid
+ maintainer-clean-host: maybe-maintainer-clean-sim
+ maintainer-clean-host: maybe-maintainer-clean-texinfo
+@@ -2705,7 +2689,6 @@ check-host:  \
+     maybe-check-libiberty-linker-plugin \
+     maybe-check-libiconv \
+     maybe-check-m4 \
 -    maybe-check-readline \
-     maybe-check-release \
-     maybe-check-recode \
-     maybe-check-sed \
-@@ -2491,7 +2477,6 @@
-     maybe-install-perl \
-     maybe-install-prms \
-     maybe-install-rcs \
+     maybe-check-sid \
+     maybe-check-sim \
+     maybe-check-texinfo \
+@@ -2843,7 +2826,6 @@ install-host-nogcc:  \
+     maybe-install-libiberty-linker-plugin \
+     maybe-install-libiconv \
+     maybe-install-m4 \
 -    maybe-install-readline \
-     maybe-install-release \
-     maybe-install-recode \
-     maybe-install-sed \
-@@ -2564,7 +2549,6 @@
-     maybe-install-perl \
-     maybe-install-prms \
-     maybe-install-rcs \
+     maybe-install-sid \
+     maybe-install-sim \
+     maybe-install-texinfo \
+@@ -2899,7 +2881,6 @@ install-host:  \
+     maybe-install-libiberty-linker-plugin \
+     maybe-install-libiconv \
+     maybe-install-m4 \
 -    maybe-install-readline \
-     maybe-install-release \
-     maybe-install-recode \
-     maybe-install-sed \
-@@ -51494,7 +51478,6 @@
- all-gdb: maybe-all-intl
- all-gdb: maybe-all-libiberty
- all-gdb: maybe-all-opcodes
+     maybe-install-sid \
+     maybe-install-sim \
+     maybe-install-texinfo \
+@@ -3010,7 +2991,6 @@ install-strip-host:  \
+     maybe-install-strip-libiberty-linker-plugin \
+     maybe-install-strip-libiconv \
+     maybe-install-strip-m4 \
+-    maybe-install-strip-readline \
+     maybe-install-strip-sid \
+     maybe-install-strip-sim \
+     maybe-install-strip-texinfo \
+@@ -63072,7 +63052,6 @@ configure-gdb: maybe-all-gnulib
+ configure-gdb: maybe-all-gdbsupport
+ all-gdb: maybe-all-gnulib
+ all-gdb: maybe-all-gdbsupport
 -all-gdb: maybe-all-readline
  all-gdb: maybe-all-build-bison
- all-gdb: maybe-all-build-byacc
  all-gdb: maybe-all-sim
-@@ -51826,7 +51809,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-gdb: maybe-all-libtermcap
+@@ -63562,7 +63541,6 @@ install-strip-sid: maybe-install-strip-t
+ install-sid: maybe-install-tk
+ install-strip-sid: maybe-install-strip-tk
+ configure-sim: maybe-all-gnulib
+-configure-sim: maybe-all-readline
  all-fastjar: maybe-all-build-texinfo
---- gdb-6.8.50.20090224/gdb/tui/tui-io.c~      2009-02-24 09:17:18.617891690 +0100
-+++ gdb-6.8.50.20090224/gdb/tui/tui-io.c       2009-02-24 09:17:43.554606911 +0100
-@@ -512,7 +512,7 @@
- void
- tui_setup_io (int mode)
- {
--  extern int readline_echoing_p;
-+  extern int _rl_echoing_p;
-  
-   if (mode)
-     {
-@@ -522,12 +522,12 @@
-       tui_old_rl_prep_terminal = rl_prep_term_function;
-       tui_old_rl_getc_function = rl_getc_function;
-       tui_old_rl_outstream = rl_outstream;
--      tui_old_readline_echoing_p = readline_echoing_p;
-+      tui_old_readline_echoing_p = _rl_echoing_p;
-       rl_redisplay_function = tui_redisplay_readline;
-       rl_deprep_term_function = tui_deprep_terminal;
-       rl_prep_term_function = tui_prep_terminal;
-       rl_getc_function = tui_getc;
--      readline_echoing_p = 0;
-+      _rl_echoing_p = 0;
-       rl_outstream = tui_rl_outstream;
-       rl_prompt = 0;
-       rl_completion_display_matches_hook = tui_rl_display_match_list;
-@@ -564,7 +564,7 @@
-       rl_getc_function = tui_old_rl_getc_function;
-       rl_outstream = tui_old_rl_outstream;
-       rl_completion_display_matches_hook = 0;
--      readline_echoing_p = tui_old_readline_echoing_p;
-+      _rl_echoing_p = tui_old_readline_echoing_p;
-       rl_already_prompted = 0;
-       /* Save tty for SIGCONT.  */
+ all-libctf: all-libiberty
+ all-stage1-libctf: all-stage1-libiberty
This page took 0.053122 seconds and 4 git commands to generate.