mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-06 23:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

readline/ediline: Fix conflicting manpages

Browse Source 
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>
This commit is contained in:
Jeremy Puhlman
2020-02-22 10:54:00 -08:00
committed by Richard Purdie
parent c43423cd28
commit 21f43cf89e
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-core/readline/readline.inc
View File

@@ -44,7 +44,13 @@ BBCLASSEXTEND = "native nativesdk"
CONFFILES_${PN} += "${sysconfdir}/inputrc"
inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "history.3"
ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"
# 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"
LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map"

6
meta/recipes-devtools/libedit/libedit_20191231-3.1.bb
View File

@@ -17,3 +17,9 @@ SRC_URI[md5sum] = "2e22a51131de94ff2df24901f7cfe416"
SRC_URI[sha256sum] = "dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071"
BBCLASSEXTEND = "native nativesdk"
inherit update-alternatives
ALTERNATIVE_PRIORITY = "90"
ALTERNATIVE_${PN} = "history.3"
ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3"