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

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

[jackie.huang]

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>
---
The following changes since commit a9d0cbe1d84bb26fc1a1f48764fe514cf9f9c548:

  gcc: Bump PR since there have been several gcc changes and various problems reported and this should flush anything stale out (2012-08-03 10:32:24 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib jhuang0/bug2891_tcl_0806
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/bug2891_tcl_0806

Jackie Huang (1):
  tcl: Add ${bindir_crossscripts}/tclConfig.sh to sysroot stage

 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

-- 
1.7.4

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

[jackie.huang]

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(-)

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"
-- 
1.7.4