summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-09 17:02:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-09 21:28:37 (GMT)
commit8181681b33da272fef83276104d5c7a93f84da46 (patch)
tree96a5e8d3276a4bff042831459456d41fb8709ae0
parent4964e42e197ed0d58f0c85ab274ddb718ae4262c (diff)
downloadpoky-8181681b33da272fef83276104d5c7a93f84da46.tar.gz
readline-native: Fix builds on tumbleweed
OpenSuse's libreadline has extra symbol information which upsets our uninative loader as our libreadline is missing symbols with the appropriate versions. The simplest solution is to add the version information as they're harmless. (From OE-Core rev: 4dc83cd3110e2cc103b29769629e91c38187a6f6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/readline/readline-8.0/rl-native.map12
-rw-r--r--meta/recipes-core/readline/readline.inc5
2 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-core/readline/readline-8.0/rl-native.map b/meta/recipes-core/readline/readline-8.0/rl-native.map
new file mode 100644
index 0000000..5e7d49c
--- /dev/null
+++ b/meta/recipes-core/readline/readline-8.0/rl-native.map
@@ -0,0 +1,12 @@
1READLINE_6.3 {
2 rl_change_environment;
3 rl_clear_history;
4 rl_executing_key;
5 rl_executing_keyseq;
6 rl_filename_stat_hook;
7 rl_history_substr_search_backward;
8 rl_history_substr_search_forward;
9 rl_input_available_hook;
10 rl_print_last_kbd_macro;
11 rl_signal_event_hook;
12};
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index e966522..07f54a7 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -43,3 +43,8 @@ do_install_append () {
43BBCLASSEXTEND = "native nativesdk" 43BBCLASSEXTEND = "native nativesdk"
44 44
45CONFFILES_${PN} += "${sysconfdir}/inputrc" 45CONFFILES_${PN} += "${sysconfdir}/inputrc"
46
47# OpenSuse injects versions into libreadline leading to conficits between our native one and theirs
48# see their spec file for where this is injected. Extra versioning is harmless so we just do the same.
49SRC_URI_append_class-native = " file://rl-native.map"
50LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" \ No newline at end of file