From dececdc8e8bd2582bd44cc3011b1a72fa519d064 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Nov 2022 20:00:52 +0100 Subject: readline: update 8.1.2 -> 8.2 Replace configure-fix.patch with --with-shared-termcap-library Backport a compatibility fix for gdb. (From OE-Core rev: 72aea7be34cd88030283b989d5381a5fd944f53d) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-devtools/gdb/gdb.inc | 1 + meta/recipes-devtools/gdb/gdb/readline-8.2.patch | 39 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-devtools/gdb/gdb/readline-8.2.patch (limited to 'meta/recipes-devtools/gdb') diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc index 3b569fd40e..5a9fe271b9 100644 --- a/meta/recipes-devtools/gdb/gdb.inc +++ b/meta/recipes-devtools/gdb/gdb.inc @@ -14,5 +14,6 @@ SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ file://0007-resolve-restrict-keyword-conflict.patch \ file://0008-Fix-invalid-sigprocmask-call.patch \ file://0009-gdbserver-ctrl-c-handling.patch \ + file://readline-8.2.patch \ " SRC_URI[sha256sum] = "0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed" diff --git a/meta/recipes-devtools/gdb/gdb/readline-8.2.patch b/meta/recipes-devtools/gdb/gdb/readline-8.2.patch new file mode 100644 index 0000000000..c2db4c0d79 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb/readline-8.2.patch @@ -0,0 +1,39 @@ +From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +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. + +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1add37b567a7dee39d99f37b37802034c3fce9c4] +Signed-off-by: Alexander Kanavin +--- + 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" + +-/* 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" + +@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw () + rl_basic_quote_characters = NULL; + } + +- return rl_completer_word_break_characters; ++ return (char *) rl_completer_word_break_characters; + } + + char * +-- +2.31.1 + -- cgit v1.2.3-54-g00ecf