tcl8: 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: Krupal Ka Patel <krkapate@cisco.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb b/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
index 0a8d6ea1bfd7939a9d3a0d4de410a8d184b8c4f6..968cd6778e8f02b13ba136cccd356082f85ee235 100644 (file)
--- a/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
+++ b/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
@@ -53,7 +53,7 @@ do_install() {
        ln -sf ./tclsh${VER} ${D}${bindir}/tclsh8
        ln -sf tclsh8.6 ${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}
@@ -107,6 +107,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