From 7a97abb3f1c2ff8fd2dc7c59f866430cf99ab82d Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 6 Aug 2012 15:05:44 +0800 Subject: 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] Signed-off-by: Jackie Huang Signed-off-by: Richard Purdie --- meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/tcltk') 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() { #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" -- cgit 1.2.3-korg