[oe-commits] [openembedded-core] 15/122: tcl: remove host path from tclConfig.sh

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko
in repository openembedded-core.

commit 54841b0a12f3d7ac9c36df110821fa39d60d456f
Author: Wenzong Fan <wenzong.fan at windriver.com>
AuthorDate: Wed Oct 11 02:07:03 2017 -0700

    tcl: remove host path from tclConfig.sh
    
    The tclConfig.sh is also used by other packages (such as expect) for
    cross-compiling, the host path from it can't be removed directly in
    the do_install step.
    
    With PACKAGE_PREPROCESS_FUNCS to remove host path and avoid the
    crossscripts installed to target.
    
    Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    (cherry picked from commit ced5618e7b3459fdd96f448ccdb55b5ced6d8214)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-devtools/tcltk/tcl_8.6.7.bb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.7.bb b/meta/recipes-devtools/tcltk/tcl_8.6.7.bb
index d00d2dc..dac73be 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.7.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.7.bb
@@ -86,3 +86,16 @@ BINCONFIG_GLOB = "*Config.sh"
 
 # Fix the path in sstate
 SSTATE_SCAN_FILES += "*Config.sh"
+
+# Cleanup host path from ${libdir}/tclConfig.sh and remove the
+# ${bindir_crossscripts}/tclConfig.sh from target
+PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess"
+tcl_package_preprocess() {
+	sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \
+	       -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \
+	       -e "s;${STAGING_INCDIR};${includedir};g" \
+	       -e "s;--sysroot=${RECIPE_SYSROOT};;g" \
+	       ${PKGD}${libdir}/tclConfig.sh
+
+	rm -f ${PKGD}${bindir_crossscripts}/tclConfig.sh
+}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.