From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 3/3] gdb: Update to 13.2
Date: Sat, 24 Jun 2023 06:33:00 +0000
Message-ID: <a7edf6c6-bd55-9dd4-9fef-fba9ae8ce55c@ipfire.org>
In-Reply-To: <20230622155736.2208-3-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5157663243613920951=="
List-Id: <development.lists.ipfire.org>

--===============5157663243613920951==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>  config/rootfiles/common/gdb       |  8 +++++--
>  lfs/gdb                           |  5 ++---
>  src/patches/gdb-readline8.2.patch | 35 -------------------------------
>  3 files changed, 8 insertions(+), 40 deletions(-)
>  delete mode 100644 src/patches/gdb-readline8.2.patch
>=20
> diff --git a/config/rootfiles/common/gdb b/config/rootfiles/common/gdb
> index e1f87549e..6a366ac7d 100644
> --- a/config/rootfiles/common/gdb
> +++ b/config/rootfiles/common/gdb
> @@ -2,10 +2,14 @@
>  #usr/bin/gdb
>  #usr/bin/gdb-add-index
>  #usr/bin/gdbserver
> +#usr/bin/run
>  #usr/include/gdb
>  #usr/include/gdb/jit-reader.h
> +#usr/include/sim
> +#usr/include/sim/callback.h
> +#usr/include/sim/sim.h
>  #usr/lib/libinproctrace.so
> -#usr/share/gdb
> +#usr/lib/libsim.a
>  #usr/share/gdb/python
>  #usr/share/gdb/python/gdb
>  #usr/share/gdb/python/gdb/FrameDecorator.py
> @@ -20,6 +24,7 @@
>  #usr/share/gdb/python/gdb/command/type_printers.py
>  #usr/share/gdb/python/gdb/command/unwinders.py
>  #usr/share/gdb/python/gdb/command/xmethods.py
> +#usr/share/gdb/python/gdb/disassembler.py
>  #usr/share/gdb/python/gdb/frames.py
>  #usr/share/gdb/python/gdb/function
>  #usr/share/gdb/python/gdb/function/__init__.py
> @@ -56,7 +61,6 @@
>  #usr/share/gdb/system-gdbinit/elinos.py
>  #usr/share/gdb/system-gdbinit/wrs-linux.py
>  #usr/share/info/annotate.info
> -#usr/share/info/ctf-spec.info
>  #usr/share/info/gdb.info
>  #usr/share/info/gdb.info-1
>  #usr/share/info/gdb.info-2
> diff --git a/lfs/gdb b/lfs/gdb
> index bd5a57f29..f534774e0 100644
> --- a/lfs/gdb
> +++ b/lfs/gdb
> @@ -24,7 +24,7 @@
> =20
>  include Config
> =20
> -VER        =3D 12.1
> +VER        =3D 13.2
> =20
>  THISAPP    =3D gdb-$(VER)
>  DL_FILE    =3D $(THISAPP).tar.xz
> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
> =20
>  $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> =20
> -$(DL_FILE)_BLAKE2 =3D 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2=
946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd
> +$(DL_FILE)_BLAKE2 =3D bf5216ba2286448a46f9e0a405367c5a678e6d7540204722d355=
b618018b7b75a2ebc5b51353304c5ded02a3979223a81781d305f5afa5be82516cdc2863d49f
> =20
>  install : $(TARGET)
> =20
> @@ -70,7 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) :
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gdb-readline8.2.patch
>  	cd $(DIR_APP) && mkdir -pv build
>  	cd $(DIR_APP)/build && \
>  		../configure \
> diff --git a/src/patches/gdb-readline8.2.patch b/src/patches/gdb-readline8.=
2.patch
> deleted file mode 100644
> index 93724b109..000000000
> --- a/src/patches/gdb-readline8.2.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001
> -From: Andreas Schwab <schwab(a)linux-m68k.org>
> -Date: Sun, 20 Mar 2022 14:01:54 +0100
> -Subject: [PATCH] Add support for readline 8.2
> -
> -In readline 8.2 the type of rl_completer_word_break_characters changed to
> -include const.
> ----
> - gdb/completer.c | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/gdb/completer.c b/gdb/completer.c
> -index d3900ae2014..a51c16ac7f8 100644
> ---- a/gdb/completer.c
> -+++ b/gdb/completer.c
> -@@ -36,7 +36,7 @@
> -    calling a hook instead so we eliminate the CLI dependency.  */
> - #include "gdbcmd.h"
> -=20
> --/* Needed for rl_completer_word_break_characters() and for
> -+/* Needed for rl_completer_word_break_characters and for
> -    rl_filename_completion_function.  */
> - #include "readline/readline.h"
> -=20
> -@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw ()
> -       rl_basic_quote_characters =3D NULL;
> -     }
> -=20
> --  return rl_completer_word_break_characters;
> -+  return (char *) rl_completer_word_break_characters;
> - }
> -=20
> - char *
> ---=20
> -2.31.1

--===============5157663243613920951==--