diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
commit | da710c8bb0dea17982efc20ab4ee226a86992e6f (patch) | |
tree | 06c83c9e85c881f40532972aaa1453298236e029 /poky/meta/recipes-core/readline | |
parent | 6656af78e6c7b48a1252459a61b3b72dce77ab44 (diff) | |
parent | 2795589128d1f7509ac0ab9eba940d868413ac7d (diff) | |
download | openbmc-da710c8bb0dea17982efc20ab4ee226a86992e6f.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/recipes-core/readline')
-rw-r--r-- | poky/meta/recipes-core/readline/readline-8.0/rl-native.map | 12 | ||||
-rw-r--r-- | poky/meta/recipes-core/readline/readline.inc | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/poky/meta/recipes-core/readline/readline-8.0/rl-native.map b/poky/meta/recipes-core/readline/readline-8.0/rl-native.map new file mode 100644 index 000000000..5e7d49cdd --- /dev/null +++ b/poky/meta/recipes-core/readline/readline-8.0/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/poky/meta/recipes-core/readline/readline.inc b/poky/meta/recipes-core/readline/readline.inc index e9665228d..07f54a76f 100644 --- a/poky/meta/recipes-core/readline/readline.inc +++ b/poky/meta/recipes-core/readline/readline.inc @@ -43,3 +43,8 @@ do_install_append () { BBCLASSEXTEND = "native nativesdk" CONFFILES_${PN} += "${sysconfdir}/inputrc" + +# 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"
\ No newline at end of file |