mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-10 18:53:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

tcl: resolve conflicts with tcl8's man pages

Browse Source 
Change the suffix from 'tcl' to 'tcl9' and from 'tcl8' to avoid
conflicts with the man pages provided by the tcl packages.

file /usr/share/man/mann/vwait.ntcl conflicts between attempted installs of tcl-doc-9.0.0-r0.riscv64 and tcl8-doc-8.6.15-r0.riscv64
file /usr/share/man/mann/while.ntcl conflicts between attempted installs of tcl-doc-9.0.0-r0.riscv64 and tcl8-doc-8.6.15-r0.riscv64
file /usr/share/man/mann/yield.ntcl conflicts between attempted installs of tcl-doc-9.0.0-r0.riscv64 and tcl8-doc-8.6.15-r0.riscv64
file /usr/share/man/mann/yieldto.ntcl conflicts between attempted installs of tcl-doc-9.0.0-r0.riscv64 and tcl8-doc-8.6.15-r0.riscv64
file /usr/share/man/mann/zlib.ntcl conflicts between attempted installs of tcl-doc-9.0.0-r0.riscv64 and tcl8-doc-8.6.15-r0.riscv64
[...]

(From OE-Core rev: b961021cc47c53ddd602e6038f5faf02416455b3)

Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Thomas Perrot
2024-11-26 15:35:58 +01:00
committed by Richard Purdie
parent 3abce65a79
commit 539d7700a0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-devtools/tcltk/tcl_9.0.0.bb
View File

@@ -35,7 +35,7 @@ VER = "${PV}"
inherit autotools ptest binconfig
AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
EXTRA_OECONF = "--disable-rpath --enable-man-suffix"
EXTRA_OECONF = "--disable-rpath --enable-man-suffix=tcl9"
# Prevent installing copy of tzdata based on tzdata installation on the build host
# It doesn't install tzdata if one of the following files exist on the host:

2
meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb
View File

@@ -38,7 +38,7 @@ VER = "${PV}"
inherit autotools ptest binconfig
AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix"
EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix=tcl8"
# Prevent installing copy of tzdata based on tzdata installation on the build host
# It doesn't install tzdata if one of the following files exist on the host: