diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-11-14 20:00:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-15 09:38:37 +0000 |
commit | dececdc8e8bd2582bd44cc3011b1a72fa519d064 (patch) | |
tree | 3cc9ea34fa36a259a500e0d3118e77144cf93c71 /meta/recipes-core/readline | |
parent | 82e8c4105c8beac04e3c5769645f3cfccefb2dc6 (diff) | |
download | poky-dececdc8e8bd2582bd44cc3011b1a72fa519d064.tar.gz |
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 <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/readline')
-rw-r--r-- | meta/recipes-core/readline/readline.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/readline/readline/configure-fix.patch | 35 | ||||
-rw-r--r-- | meta/recipes-core/readline/readline_8.1.2.bb | 7 | ||||
-rw-r--r-- | meta/recipes-core/readline/readline_8.2.bb | 5 |
4 files changed, 6 insertions, 43 deletions
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 7f2f1a092b..4aefc5636d 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc | |||
@@ -18,7 +18,7 @@ SRC_URI += "file://inputrc" | |||
18 | inherit autotools texinfo | 18 | inherit autotools texinfo |
19 | 19 | ||
20 | EXTRA_AUTORECONF += "--exclude=autoheader" | 20 | EXTRA_AUTORECONF += "--exclude=autoheader" |
21 | EXTRA_OECONF += "bash_cv_termcap_lib=ncurses" | 21 | EXTRA_OECONF += "bash_cv_termcap_lib=ncurses --with-shared-termcap-library" |
22 | 22 | ||
23 | LEAD_SONAME = "libreadline.so" | 23 | LEAD_SONAME = "libreadline.so" |
24 | 24 | ||
diff --git a/meta/recipes-core/readline/readline/configure-fix.patch b/meta/recipes-core/readline/readline/configure-fix.patch deleted file mode 100644 index ef3104f8a6..0000000000 --- a/meta/recipes-core/readline/readline/configure-fix.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Without this it fails to link against libtermcap causing various missing | ||
4 | symbols issues. | ||
5 | |||
6 | RP - 8/10/08 | ||
7 | |||
8 | Support 6.3 which uses configure.ac rather than configure.in. | ||
9 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
10 | --- | ||
11 | configure.ac | 8 ++++---- | ||
12 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index cea8f91..9075b8f 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -218,10 +218,10 @@ if test -f ${srcdir}/support/shobj-conf; then | ||
19 | AC_MSG_CHECKING(configuration for building shared libraries) | ||
20 | eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` | ||
21 | |||
22 | -# case "$SHLIB_LIBS" in | ||
23 | -# *curses*|*termcap*|*termlib*) ;; | ||
24 | -# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; | ||
25 | -# esac | ||
26 | + case "$SHLIB_LIBS" in | ||
27 | + *curses*|*termcap*|*termlib*) ;; | ||
28 | + *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;; | ||
29 | + esac | ||
30 | |||
31 | AC_SUBST(SHOBJ_CC) | ||
32 | AC_SUBST(SHOBJ_CFLAGS) | ||
33 | -- | ||
34 | 1.8.1.2 | ||
35 | |||
diff --git a/meta/recipes-core/readline/readline_8.1.2.bb b/meta/recipes-core/readline/readline_8.1.2.bb deleted file mode 100644 index 787f7e734a..0000000000 --- a/meta/recipes-core/readline/readline_8.1.2.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | require readline.inc | ||
2 | |||
3 | SRC_URI += "file://configure-fix.patch \ | ||
4 | file://norpath.patch \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[archive.sha256sum] = "7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6" | ||
diff --git a/meta/recipes-core/readline/readline_8.2.bb b/meta/recipes-core/readline/readline_8.2.bb new file mode 100644 index 0000000000..3a47297fe1 --- /dev/null +++ b/meta/recipes-core/readline/readline_8.2.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require readline.inc | ||
2 | |||
3 | SRC_URI += " file://norpath.patch" | ||
4 | |||
5 | SRC_URI[archive.sha256sum] = "3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" | ||