mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

readline: update 8.1.2 -> 8.2

Browse Source 
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 <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-11-14 20:00:52 +01:00
committed by Richard Purdie
parent 82e8c4105c
commit dececdc8e8
6 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-core/readline/readline.inc
View File

@@ -18,7 +18,7 @@ SRC_URI += "file://inputrc"
inherit autotools texinfo
EXTRA_AUTORECONF += "--exclude=autoheader"
EXTRA_OECONF += "bash_cv_termcap_lib=ncurses"
EXTRA_OECONF += "bash_cv_termcap_lib=ncurses --with-shared-termcap-library"
LEAD_SONAME = "libreadline.so"

35
meta/recipes-core/readline/readline/configure-fix.patch
View File

@@ -1,35 +0,0 @@
Upstream-Status: Pending
Without this it fails to link against libtermcap causing various missing
symbols issues.
RP - 8/10/08
Support 6.3 which uses configure.ac rather than configure.in.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index cea8f91..9075b8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,10 +218,10 @@ if test -f ${srcdir}/support/shobj-conf; then
AC_MSG_CHECKING(configuration for building shared libraries)
eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
-# case "$SHLIB_LIBS" in
-# *curses*|*termcap*|*termlib*) ;;
-# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
-# esac
+ case "$SHLIB_LIBS" in
+ *curses*|*termcap*|*termlib*) ;;
+ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
+ esac
AC_SUBST(SHOBJ_CC)
AC_SUBST(SHOBJ_CFLAGS)
--
1.8.1.2

7
meta/recipes-core/readline/readline_8.1.2.bb
View File

@@ -1,7 +0,0 @@
require readline.inc
SRC_URI += "file://configure-fix.patch \
file://norpath.patch \
"
SRC_URI[archive.sha256sum] = "7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6"

5
meta/recipes-core/readline/readline_8.2.bb Normal file
View File

@@ -0,0 +1,5 @@
require readline.inc
SRC_URI += " file://norpath.patch"
SRC_URI[archive.sha256sum] = "3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35"

1
meta/recipes-devtools/gdb/gdb.inc
View File

@@ -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"

39
meta/recipes-devtools/gdb/gdb/readline-8.2.patch Normal file
View File

@@ -0,0 +1,39 @@
From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@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.
Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1add37b567a7dee39d99f37b37802034c3fce9c4]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
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