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:34 +0000 |
commit | 72aea7be34cd88030283b989d5381a5fd944f53d (patch) | |
tree | 51b68b65c240ac47f92409d186b8aa69ccc43d39 /meta/recipes-core | |
parent | 4fb53b5f829b1126aceeeca5a6f905e987178268 (diff) | |
download | openembedded-core-72aea7be34cd88030283b989d5381a5fd944f53d.tar.gz |
readline: update 8.1.2 -> 8.2
Replace configure-fix.patch with --with-shared-termcap-library
Backport a compatibility fix for gdb.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-core')
-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" 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" 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 @@ -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 - 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 @@ -require readline.inc - -SRC_URI += "file://configure-fix.patch \ - file://norpath.patch \ - " - -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 @@ +require readline.inc + +SRC_URI += " file://norpath.patch" + +SRC_URI[archive.sha256sum] = "3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" |