diff options
| author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-02-22 10:54:00 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-25 10:41:22 +0000 |
| commit | 21f43cf89e29c223bfd4cc31b726c663a7887f86 (patch) | |
| tree | 78b9ae269a4bab577e9cb2b3b1316559286df3fb /meta/recipes-core | |
| parent | c43423cd28d086d31c06c7e047dba139b35f5cdb (diff) | |
| download | poky-21f43cf89e29c223bfd4cc31b726c663a7887f86.tar.gz | |
readline/ediline: Fix conflicting manpages
file /usr/share/man/man3/history.3 conflicts between attempted installs of libedit-doc-20191231+3.1-r0.corei7_64 and readline-doc-8.0-r0.corei7_64
(From OE-Core rev: 23ad05b98a2e1ced47aac3b1d7689c7146ff8c91)
Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/readline/readline.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 07f54a76f1..4babcbd69a 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc | |||
| @@ -44,7 +44,13 @@ BBCLASSEXTEND = "native nativesdk" | |||
| 44 | 44 | ||
| 45 | CONFFILES_${PN} += "${sysconfdir}/inputrc" | 45 | CONFFILES_${PN} += "${sysconfdir}/inputrc" |
| 46 | 46 | ||
| 47 | inherit update-alternatives | ||
| 48 | |||
| 49 | ALTERNATIVE_PRIORITY = "100" | ||
| 50 | ALTERNATIVE_${PN} = "history.3" | ||
| 51 | ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" | ||
| 52 | |||
| 47 | # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs | 53 | # 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. | 54 | # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. |
| 49 | SRC_URI_append_class-native = " file://rl-native.map" | 55 | SRC_URI_append_class-native = " file://rl-native.map" |
| 50 | LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" \ No newline at end of file | 56 | LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" |