summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2012-08-06 15:05:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 15:18:45 +0100
commit3d07ef11b848876e07bf94ae9cf6c12bb281d744 (patch)
tree4ba1b49ce51983e4826aadd006a3234ae0e1ba69 /meta
parente51d01a6b7336e997199966fb386c8a73a712fb3 (diff)
downloadpoky-3d07ef11b848876e07bf94ae9cf6c12bb281d744.tar.gz
tcl: Add ${bindir_crossscripts}/tclConfig.sh to sysroot stage
tclConfig.sh is changed in do_install for cross compile and is installed to STAGING_BINDIR_CROSS, but if SSTATE_DIR is set and tcl is from sstage, tclConfig.sh can't be found in STAGING_BINDIR_CROSS, add ${bindir_crossscripts}/tclConfig.sh to sysroot stage can fix it. [YOCTO #2891] (From OE-Core rev: 7a97abb3f1c2ff8fd2dc7c59f866430cf99ab82d) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.5.11.bb9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index d5cf6dc167..f19e25a7de 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -49,8 +49,8 @@ do_install() {
49 #sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh 49 #sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
50 sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh 50 sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
51 sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh 51 sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh
52 install -d ${STAGING_BINDIR_CROSS}/ 52 install -d ${D}${bindir_crossscripts}
53 install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS} 53 install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
54 cd .. 54 cd ..
55 for dir in compat generic unix 55 for dir in compat generic unix
56 do 56 do
@@ -59,6 +59,11 @@ do_install() {
59 done 59 done
60} 60}
61 61
62SYSROOT_PREPROCESS_FUNCS += "tcl_sysroot_preprocess"
63tcl_sysroot_preprocess () {
64 sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
65}
66
62PACKAGES =+ "tcl-lib" 67PACKAGES =+ "tcl-lib"
63FILES_tcl-lib = "${libdir}/libtcl8.5.so*" 68FILES_tcl-lib = "${libdir}/libtcl8.5.so*"
64FILES_${PN} += "${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8" 69FILES_${PN} += "${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8"