summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-09 18:02:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-09 22:28:32 +0100
commit4dc83cd3110e2cc103b29769629e91c38187a6f6 (patch)
tree63286e99e8fb7cd2a17c48d39db50848d539990a
parent8ffe6ca984e034976322beea9b16c92d46708d15 (diff)
downloadopenembedded-core-4dc83cd3110e2cc103b29769629e91c38187a6f6.tar.gz
openembedded-core-4dc83cd3110e2cc103b29769629e91c38187a6f6.tar.bz2
openembedded-core-4dc83cd3110e2cc103b29769629e91c38187a6f6.zip
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. 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 0000000000..5e7d49cdd2
--- /dev/null
+++ b/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/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index e9665228dc..07f54a76f1 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/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