[oe-commits] [openembedded-core] branch master-next updated: readline-native: Fix builds on tumbleweed

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

The following commit(s) were added to refs/heads/master-next by this push:
     new 07ba71d  readline-native: Fix builds on tumbleweed
07ba71d is described below

commit 07ba71d04642e13a66597823842c80e0f8bf3d46
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Oct 9 18:02:31 2019 +0100

    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 at linuxfoundation.org>
---
 meta/recipes-core/readline/readline-8.0/rl-native.map | 12 ++++++++++++
 meta/recipes-core/readline/readline.inc               |  5 +++++
 2 files changed, 17 insertions(+)

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 @@
+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 e966522..07f54a7 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.