diff options
| author | Thomas Perrot <thomas.perrot@bootlin.com> | 2024-11-26 15:35:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-11-28 12:27:11 +0000 |
| commit | 539d7700a0641fc72347b9054ebfa0da01b61ac6 (patch) | |
| tree | 3dd2b4c6795b69a330f52376ca2857cf64695416 | |
| parent | 3abce65a7910518f426e15ca48147f12cebc0208 (diff) | |
| download | poky-539d7700a0641fc72347b9054ebfa0da01b61ac6.tar.gz | |
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 <thomas.perrot@bootlin.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/tcltk/tcl_9.0.0.bb | 2 | ||||
| -rw-r--r-- | 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}" | |||
| 35 | inherit autotools ptest binconfig | 35 | inherit autotools ptest binconfig |
| 36 | 36 | ||
| 37 | AUTOTOOLS_SCRIPT_PATH = "${S}/unix" | 37 | AUTOTOOLS_SCRIPT_PATH = "${S}/unix" |
| 38 | EXTRA_OECONF = "--disable-rpath --enable-man-suffix" | 38 | EXTRA_OECONF = "--disable-rpath --enable-man-suffix=tcl9" |
| 39 | 39 | ||
| 40 | # Prevent installing copy of tzdata based on tzdata installation on the build host | 40 | # Prevent installing copy of tzdata based on tzdata installation on the build host |
| 41 | # It doesn't install tzdata if one of the following files exist on the host: | 41 | # 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}" | |||
| 38 | inherit autotools ptest binconfig | 38 | inherit autotools ptest binconfig |
| 39 | 39 | ||
| 40 | AUTOTOOLS_SCRIPT_PATH = "${S}/unix" | 40 | AUTOTOOLS_SCRIPT_PATH = "${S}/unix" |
| 41 | EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix" | 41 | EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix=tcl8" |
| 42 | 42 | ||
| 43 | # Prevent installing copy of tzdata based on tzdata installation on the build host | 43 | # Prevent installing copy of tzdata based on tzdata installation on the build host |
| 44 | # It doesn't install tzdata if one of the following files exist on the host: | 44 | # It doesn't install tzdata if one of the following files exist on the host: |