tcl: fix tclConfig.sh after UNPACKDIR change

Adapt the  sed command that edits TCL_SRC_DIR in tclConfig.sh
This is needed so that tk in meta-oe is capable of reading
the required header file

Remove buildpath from TCL_BUILD_STUB_LIB_PATH in tclConfig.sh

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/tcltk/tcl_9.0.1.bb b/meta/recipes-devtools/tcltk/tcl_9.0.1.bb
index 70aa9b606c68b1bc9db86e99fde5a5958fc7cf47..765dc64e4d39a87d6e223f0feb3065a05f9600db 100644 (file)
--- a/meta/recipes-devtools/tcltk/tcl_9.0.1.bb
+++ b/meta/recipes-devtools/tcltk/tcl_9.0.1.bb
@@ -51,7 +51,7 @@ do_install() {
        ln -sf ./tclsh${VER} ${D}${bindir}/tclsh
        ln -sf tclsh9.0 ${D}${bindir}/tclsh${VER}
        sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh
-       sed -i "s;'${WORKDIR};'${STAGING_INCDIR};g" tclConfig.sh
+       sed -i "s;'${UNPACKDIR};'${STAGING_INCDIR};g" tclConfig.sh
        install -d ${D}${bindir_crossscripts}
        install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
        install -m 0755 tclConfig.sh ${D}${libdir}
@@ -105,6 +105,7 @@ tcl_package_preprocess() {
               -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \
               -e "s;${STAGING_INCDIR};${includedir};g" \
               -e "s;--sysroot=${RECIPE_SYSROOT};;g" \
+              -e "s;${B};${libdir};g" ${PKGD}${libdir}/tclConfig.sh \
               ${PKGD}${libdir}/tclConfig.sh
 
        rm -f ${PKGD}${bindir_crossscripts}/tclConfig.sh