readline: upgrade to 6.3
cover readline: upgrade to 6.3
The following changes since commit 54c2e993ec129563c7ae9f3fdee74ab60da28698:
bsps: update H/W reference boards to v3.10.32 (2014-03-02 17:25:30 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib hongxu/readline
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/readline
Hongxu Jia (3):
readline: upgrade to 6.3
readline: update configure-fix.patch
readline: drop
readline-only-enable-meta-key-for-a-single-call-read.patch
.../readline/{readline-6.2 => files}/acinclude.m4 | 0
.../readline/{readline-6.2 => files}/norpath.patch | 0
.../{files => readline-5.2}/configure-fix.patch | 0
...ly-enable-meta-key-for-a-single-call-read.patch | 114 ---------------------
.../readline/readline-6.3/configure-fix.patch | 35 +++++++
meta/recipes-core/readline/readline_6.2.bb | 22 ----
meta/recipes-core/readline/readline_6.3.bb | 5 +
7 files changed, 40 insertions(+), 136 deletions(-)
rename meta/recipes-core/readline/{readline-6.2 => files}/acinclude.m4 (100%)
rename meta/recipes-core/readline/{readline-6.2 => files}/norpath.patch (100%)
rename meta/recipes-core/readline/{files => readline-5.2}/configure-fix.patch (100%)
delete mode 100644 meta/recipes-core/readline/readline-6.2/readline-only-enable-meta-key-for-a-single-call-read.patch
create mode 100644 meta/recipes-core/readline/readline-6.3/configure-fix.patch
delete mode 100644 meta/recipes-core/readline/readline_6.2.bb
create mode 100644 meta/recipes-core/readline/readline_6.3.bbSignature · 1 line
1.8.1.2
PATCH 1/3 readline: upgrade to 6.3
The readline-6.2-patches is obsolete for 6.3
---
.../readline/{readline-6.2 => files}/acinclude.m4 | 0
.../readline/{readline-6.2 => files}/norpath.patch | 0
meta/recipes-core/readline/readline_6.2.bb | 22 ----------------------
meta/recipes-core/readline/readline_6.3.bb | 5 +++++
4 files changed, 5 insertions(+), 22 deletions(-)
rename meta/recipes-core/readline/{readline-6.2 => files}/acinclude.m4 (100%)
rename meta/recipes-core/readline/{readline-6.2 => files}/norpath.patch (100%)
delete mode 100644 meta/recipes-core/readline/readline_6.2.bb
create mode 100644 meta/recipes-core/readline/readline_6.3.bbmeta/recipes-core/readline/files/acinclude.m4 renamed from meta/recipes-core/readline/readline-6.2/acinclude.m4 +0 -0
meta/recipes-core/readline/files/norpath.patch renamed from meta/recipes-core/readline/readline-6.2/norpath.patch +0 -0
meta/recipes-core/readline/readline_6.2.bb deleted +0 -22
@@ -1,22 +0,0 @@ -require readline.inc - -PR = "r4" - -SRC_URI += "${GNU_MIRROR}/readline/readline-6.2-patches/readline62-001;name=patch1;apply=yes;striplevel=0 \ -${GNU_MIRROR}/readline/readline-6.2-patches/readline62-002;name=patch2;apply=yes;striplevel=0 \ -${GNU_MIRROR}/readline/readline-6.2-patches/readline62-003;name=patch3;apply=yes;striplevel=0 \ -${GNU_MIRROR}/readline/readline-6.2-patches/readline62-004;name=patch4;apply=yes;striplevel=0 \ -file://readline-only-enable-meta-key-for-a-single-call-read.patch \ -" - -SRC_URI[archive.md5sum] = "67948acb2ca081f23359d0256e9a271c" -SRC_URI[archive.sha256sum] = "79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" - -SRC_URI[patch1.md5sum] = "83287d52a482f790dfb30ec0a8746669" -SRC_URI[patch1.sha256sum] = "38a86c417437692db01069c8ab40a9a8f548e67ad9af0390221b024b1c39b4e3" -SRC_URI[patch2.md5sum] = "0665020ea118e8434bd145fb71f452cc" -SRC_URI[patch2.sha256sum] = "1e6349128cb573172063ea007c67af79256889c809973002ca66c5dfc503c7d4" -SRC_URI[patch3.md5sum] = "c9d5d79718856e711667dede87cb7622" -SRC_URI[patch3.sha256sum] = "cb2131ff352d6e5f82edc09755191f74220b15f026bdb6c52624931c79622374" -SRC_URI[patch4.md5sum] = "c08e787f50579ce301075c523fa660a4" -SRC_URI[patch4.sha256sum] = "09bd342479ea5bb8b6411bfdf7d302fab2e521d1d241bcb8344d3bad5d9f5476"
meta/recipes-core/readline/readline_6.3.bb new file +5 -0
@@ -0,0 +1,5 @@ +require readline.inc + +SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a" +SRC_URI[archive.sha256sum] = "56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" +
Signature · 1 line
1.8.1.2
PATCH 2/3 readline: update configure-fix.patch
In reply to Hongxu JiaThe configure-fix.patch is used to patch configure.in in 6.2 (or 5.2), but configure.ac in 6.3
---
.../{files => readline-5.2}/configure-fix.patch | 0
.../readline/readline-6.3/configure-fix.patch | 35 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
rename meta/recipes-core/readline/{files => readline-5.2}/configure-fix.patch (100%)
create mode 100644 meta/recipes-core/readline/readline-6.3/configure-fix.patchmeta/recipes-core/readline/readline-5.2/configure-fix.patch renamed from meta/recipes-core/readline/files/configure-fix.patch +0 -0
meta/recipes-core/readline/readline-6.3/configure-fix.patch new file +35 -0
@@ -0,0 +1,35 @@ +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 <[email protected]> +--- + 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 +
Signature · 1 line
1.8.1.2
PATCH 3/3 readline: drop readline-only-enable-meta-key-for-a-single-call-read.patch
In reply to Hongxu JiaThe 6.3 has fixed this issue.
--- ...ly-enable-meta-key-for-a-single-call-read.patch | 114 --------------------- 1 file changed, 114 deletions(-) delete mode 100644 meta/recipes-core/readline/readline-6.2/readline-only-enable-meta-key-for-a-single-call-read.patch
meta/recipes-core/readline/readline-6.2/readline-only-enable-meta-key-for-a-single-call-read.patch deleted +0 -114
@@ -1,114 +0,0 @@ -readline: only enable meta key for a single call readline(). - -terminal.c - - change _rl_enable_meta_key to set a flag indicating that it sent the - enable-meta sequence - - _rl_disable_meta_key: new function to turn off meta mode after we - turned it on with _rl_enable_meta_key - -rlprivate.h - - extern declaration for _rl_disable_meta_key - -readline.c -- _rl_internal_teardown: add call to _rl_disable_meta_key to make the - meta key active only for the duration of the call to readline() -- _rl_internal_setup: move call to _rl_enable_meta_key here from - readline_initialize_everything so the meta key is active only for - the duration of the call to readline(). Suggestion from Miroslav - Lichvar <[email protected]> - -Signed-off-by: Hongxu Jia <[email protected]> -Upstream-Status: backport -Imported patch from: http://git.savannah.gnu.org/cgit/bash.git/tag/?id=bash-4.3-alpha ---- - readline.c | 12 ++++++++---- - rlprivate.h | 1 + - terminal.c | 19 ++++++++++++++++++- - 3 files changed, 27 insertions(+), 5 deletions(-) - -diff --git a/readline.c b/readline.c ---- a/readline.c -+++ b/readline.c -@@ -369,6 +369,11 @@ readline_internal_setup () - _rl_in_stream = rl_instream; - _rl_out_stream = rl_outstream; - -+ /* Enable the meta key only for the duration of readline(), if this -+ terminal has one. */ -+ if (_rl_enable_meta) -+ _rl_enable_meta_key (); -+ - if (rl_startup_hook) - (*rl_startup_hook) (); - -@@ -437,6 +442,9 @@ readline_internal_teardown (eof) - if (rl_undo_list) - rl_free_undo_list (); - -+ /* Disable the meta key, if this terminal has one. */ -+ _rl_disable_meta_key (); -+ - /* Restore normal cursor, if available. */ - _rl_set_insert_mode (RL_IM_INSERT, 0); - -@@ -1091,10 +1099,6 @@ readline_initialize_everything () - /* Try to bind a common arrow key prefix, if not already bound. */ - bind_arrow_keys (); - -- /* Enable the meta key, if this terminal has one. */ -- if (_rl_enable_meta) -- _rl_enable_meta_key (); -- - /* If the completion parser's default word break characters haven't - been set yet, then do so now. */ - if (rl_completer_word_break_characters == (char *)NULL) -diff --git a/rlprivate.h b/rlprivate.h -index 384ff67..be2c2c6 100644 ---- a/rlprivate.h -+++ b/rlprivate.h -@@ -339,6 +339,7 @@ extern int _rl_output_character_function PARAMS((int)); - extern void _rl_output_some_chars PARAMS((const char *, int)); - extern int _rl_backspace PARAMS((int)); - extern void _rl_enable_meta_key PARAMS((void)); -+extern void _rl_disable_meta_key PARAMS((void)); - extern void _rl_control_keypad PARAMS((int)); - extern void _rl_set_cursor PARAMS((int, int)); - -diff --git a/terminal.c b/terminal.c -index f8c2f6e..21ee031 100644 ---- a/terminal.c -+++ b/terminal.c -@@ -683,12 +683,29 @@ rl_ding () - /* */ - /* **************************************************************** */ - -+static int enabled_meta = 0; /* flag indicating we enabled meta mode */ -+ - void - _rl_enable_meta_key () - { - #if !defined (__DJGPP__) - if (term_has_meta && _rl_term_mm) -- tputs (_rl_term_mm, 1, _rl_output_character_function); -+ { -+ tputs (_rl_term_mm, 1, _rl_output_character_function); -+ enabled_meta = 1; -+ } -+#endif -+} -+ -+void -+_rl_disable_meta_key () -+{ -+#if !defined (__DJGPP__) -+ if (term_has_meta && _rl_term_mo && enabled_meta) -+ { -+ tputs (_rl_term_mo, 1, _rl_output_character_function); -+ enabled_meta = 0; -+ } - #endif - } - --- -1.8.1.2 -
Signature · 1 line
1.8.1.2