diff options
Diffstat (limited to 'meta/recipes-core/readline')
| -rw-r--r-- | meta/recipes-core/readline/readline-8.1/configure-fix.patch (renamed from meta/recipes-core/readline/readline-8.0/configure-fix.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/readline/readline-8.1/norpath.patch (renamed from meta/recipes-core/readline/readline-8.0/norpath.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/readline/readline-8.1/rl-native.map | 12 | ||||
| -rw-r--r-- | meta/recipes-core/readline/readline.inc | 20 | ||||
| -rw-r--r-- | meta/recipes-core/readline/readline_8.0.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-core/readline/readline_8.1.bb | 7 |
6 files changed, 35 insertions, 11 deletions
diff --git a/meta/recipes-core/readline/readline-8.0/configure-fix.patch b/meta/recipes-core/readline/readline-8.1/configure-fix.patch index ef3104f8a6..ef3104f8a6 100644 --- a/meta/recipes-core/readline/readline-8.0/configure-fix.patch +++ b/meta/recipes-core/readline/readline-8.1/configure-fix.patch diff --git a/meta/recipes-core/readline/readline-8.0/norpath.patch b/meta/recipes-core/readline/readline-8.1/norpath.patch index 5d71582b70..5d71582b70 100644 --- a/meta/recipes-core/readline/readline-8.0/norpath.patch +++ b/meta/recipes-core/readline/readline-8.1/norpath.patch diff --git a/meta/recipes-core/readline/readline-8.1/rl-native.map b/meta/recipes-core/readline/readline-8.1/rl-native.map new file mode 100644 index 0000000000..5e7d49cdd2 --- /dev/null +++ b/meta/recipes-core/readline/readline-8.1/rl-native.map @@ -0,0 +1,12 @@ +READLINE_6.3 { + rl_change_environment; + rl_clear_history; + rl_executing_key; + rl_executing_keyseq; + rl_filename_stat_hook; + rl_history_substr_search_backward; + rl_history_substr_search_forward; + rl_input_available_hook; + rl_print_last_kbd_macro; + rl_signal_event_hook; +}; diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index e9665228dc..569e4ff6e9 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -4,7 +4,7 @@ command lines as they are typed in. Both Emacs and vi editing modes are availabl additional functions to maintain a list of previously-entered command lines, to recall and perhaps reedit those \ lines, and perform csh-like history expansion on previous commands." SECTION = "libs" -HOMEPAGE = "https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +HOMEPAGE = "https://tiswww.case.edu/php/chet/readline/rltop.html" # GPLv2+ (< 6.0), GPLv3+ (>= 6.0) LICENSE = "GPLv3+" @@ -18,16 +18,17 @@ SRC_URI += "file://inputrc" inherit autotools texinfo EXTRA_AUTORECONF += "--exclude=autoheader" +EXTRA_OECONF += "bash_cv_termcap_lib=ncurses" LEAD_SONAME = "libreadline.so" -do_configure_prepend () { +do_configure:prepend () { if [ ! -e ${S}/acinclude.m4 ]; then cat ${S}/aclocal.m4 > ${S}/acinclude.m4 fi } -do_install_append () { +do_install:append () { # Make install doesn't properly install these oe_libinstall -so -C shlib libhistory ${D}${libdir} oe_libinstall -so -C shlib libreadline ${D}${libdir} @@ -42,4 +43,15 @@ do_install_append () { BBCLASSEXTEND = "native nativesdk" -CONFFILES_${PN} += "${sysconfdir}/inputrc" +CONFFILES:${PN} += "${sysconfdir}/inputrc" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN}-doc = "history.3" +ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" + +# OpenSuse injects versions into libreadline leading to conficits between our native one and theirs +# see their spec file for where this is injected. Extra versioning is harmless so we just do the same. +SRC_URI:append:class-native = " file://rl-native.map" +LDFLAGS:append:class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" diff --git a/meta/recipes-core/readline/readline_8.0.bb b/meta/recipes-core/readline/readline_8.0.bb deleted file mode 100644 index 99d022a32f..0000000000 --- a/meta/recipes-core/readline/readline_8.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require readline.inc - -SRC_URI += "file://configure-fix.patch \ - file://norpath.patch" - -SRC_URI[archive.md5sum] = "7e6c1f16aee3244a69aba6e438295ca3" -SRC_URI[archive.sha256sum] = "e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" diff --git a/meta/recipes-core/readline/readline_8.1.bb b/meta/recipes-core/readline/readline_8.1.bb new file mode 100644 index 0000000000..0786a08163 --- /dev/null +++ b/meta/recipes-core/readline/readline_8.1.bb @@ -0,0 +1,7 @@ +require readline.inc + +SRC_URI += "file://configure-fix.patch \ + file://norpath.patch" + +SRC_URI[archive.md5sum] = "e9557dd5b1409f5d7b37ef717c64518e" +SRC_URI[archive.sha256sum] = "f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" |