From 539d7700a0641fc72347b9054ebfa0da01b61ac6 Mon Sep 17 00:00:00 2001 From: Thomas Perrot Date: Tue, 26 Nov 2024 15:35:58 +0100 Subject: tcl: resolve conflicts with tcl8's man pages 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-devtools/tcltk/tcl_9.0.0.bb | 2 +- meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/tcltk/tcl_9.0.0.bb b/meta/recipes-devtools/tcltk/tcl_9.0.0.bb index a6e1dfbb5b..46e8e7d5c5 100644 --- a/meta/recipes-devtools/tcltk/tcl_9.0.0.bb +++ b/meta/recipes-devtools/tcltk/tcl_9.0.0.bb @@ -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: diff --git a/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb b/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb index 9d1c724d64..928124148c 100644 --- a/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb +++ b/meta/recipes-devtools/tcltk8/tcl8_8.6.15.bb @@ -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: -- cgit v1.2.3-54-g00ecf