summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-12-21 14:19:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-30 23:39:10 +0000
commit4600ba62f1afd09ac10e138f11ac129d928810e5 (patch)
tree07194af6be1d39596e57882affdafeca247e23a6
parent52e10a01b455a2a0439cb1abacf35c8c6fb55e09 (diff)
downloadpoky-4600ba62f1afd09ac10e138f11ac129d928810e5.tar.gz
perl/tcl: fix /usr/share/man/man3/Thread.3 conflicts
While installing perl-doc and tcl-doc to image, there is a file conflicts at do_rootfs ... |file /usr/share/man/man3/Thread.3 conflicts between attempted installs of perl-doc-5.30.1-r0.core2_64 and tcl-doc-8.6.10-r0.core2_64 ... Use update-alternatives to fix (From OE-Core rev: 47df8c0dd8ff86af97e6c6d217fb8d69ebec24e5) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/perl/perl_5.30.1.bb6
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.10.bb5
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.30.1.bb b/meta/recipes-devtools/perl/perl_5.30.1.bb
index 9b1f1af072..6e0b2007fb 100644
--- a/meta/recipes-devtools/perl/perl_5.30.1.bb
+++ b/meta/recipes-devtools/perl/perl_5.30.1.bb
@@ -32,7 +32,7 @@ SRC_URI[perl-cross.sha256sum] = "edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d159055
32 32
33S = "${WORKDIR}/perl-${PV}" 33S = "${WORKDIR}/perl-${PV}"
34 34
35inherit upstream-version-is-even 35inherit upstream-version-is-even update-alternatives
36 36
37DEPENDS += "zlib virtual/crypt" 37DEPENDS += "zlib virtual/crypt"
38 38
@@ -240,6 +240,10 @@ FILES_${PN}-module-cpan += "${libdir}/perl5/${PV}/CPAN \
240 " 240 "
241FILES_${PN}-module-unicore += "${libdir}/perl5/${PV}/unicore" 241FILES_${PN}-module-unicore += "${libdir}/perl5/${PV}/unicore"
242 242
243ALTERNATIVE_PRIORITY = "40"
244ALTERNATIVE_${PN}-doc = "Thread.3"
245ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3"
246
243# Create a perl-modules package recommending all the other perl 247# Create a perl-modules package recommending all the other perl
244# packages (actually the non modules packages and not created too) 248# packages (actually the non modules packages and not created too)
245ALLOW_EMPTY_${PN}-modules = "1" 249ALLOW_EMPTY_${PN}-modules = "1"
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.10.bb b/meta/recipes-devtools/tcltk/tcl_8.6.10.bb
index 284f20e27a..aedd96b021 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.10.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.10.bb
@@ -34,7 +34,7 @@ S = "${WORKDIR}/${BPN}${PV}/unix"
34 34
35VER = "${PV}" 35VER = "${PV}"
36 36
37inherit autotools ptest binconfig 37inherit autotools ptest binconfig update-alternatives
38 38
39EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}" 39EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}"
40 40
@@ -65,6 +65,9 @@ FILES_tcl-lib = "${libdir}/libtcl8.6.so.*"
65FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8" 65FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8"
66FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" 66FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh"
67 67
68ALTERNATIVE_${PN}-doc = "Thread.3"
69ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3"
70
68# isn't getting picked up by shlibs code 71# isn't getting picked up by shlibs code
69RDEPENDS_${PN} += "tcl-lib" 72RDEPENDS_${PN} += "tcl-lib"
70RDEPENDS_${PN}_class-native = "" 73RDEPENDS_${PN}_class-native = ""