Patchwork [1/1] tcl: Add ${bindir_crossscripts}/tclConfig.sh to sysroot stage

login
register
mail settings
Submitter jackie huang
Date Aug. 6, 2012, 7:05 a.m.
Message ID <dcb54534accacfee23d0ad69ab0e105baa81054d.1344236526.git.jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/33965/
State Accepted
Commit 7a97abb3f1c2ff8fd2dc7c59f866430cf99ab82d
Headers show

Comments

jackie huang - Aug. 6, 2012, 7:05 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

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]

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index d5cf6dc..f19e25a 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() {
 	#sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
 	sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh 
-	install -d ${STAGING_BINDIR_CROSS}/
-	install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS}
+	install -d ${D}${bindir_crossscripts}
+	install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
 	cd ..
 	for dir in compat generic unix
 	do
@@ -59,6 +59,11 @@  do_install() {
 	done
 }
 
+SYSROOT_PREPROCESS_FUNCS += "tcl_sysroot_preprocess"
+tcl_sysroot_preprocess () {
+	sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
+}
+
 PACKAGES =+ "tcl-lib"
 FILES_tcl-lib = "${libdir}/libtcl8.5.so*"
 FILES_${PN} += "${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8"