diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2017-10-11 02:07:03 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-04 17:23:55 +0000 |
commit | 0fc114ba76d85093aecedb082b8c7b7886d64f77 (patch) | |
tree | 06cf509789e312e5a79b4e92c05ed55f7a3bf91f /meta | |
parent | b21f8e361ba35c52bab4f1480b86833136fffd3d (diff) | |
download | poky-0fc114ba76d85093aecedb082b8c7b7886d64f77.tar.gz |
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.
(From OE-Core rev: 54841b0a12f3d7ac9c36df110821fa39d60d456f)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit ced5618e7b3459fdd96f448ccdb55b5ced6d8214)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.7.bb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.7.bb b/meta/recipes-devtools/tcltk/tcl_8.6.7.bb index d00d2dc62b..dac73be6e7 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" | |||
86 | 86 | ||
87 | # Fix the path in sstate | 87 | # Fix the path in sstate |
88 | SSTATE_SCAN_FILES += "*Config.sh" | 88 | SSTATE_SCAN_FILES += "*Config.sh" |
89 | |||
90 | # Cleanup host path from ${libdir}/tclConfig.sh and remove the | ||
91 | # ${bindir_crossscripts}/tclConfig.sh from target | ||
92 | PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" | ||
93 | tcl_package_preprocess() { | ||
94 | sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ | ||
95 | -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ | ||
96 | -e "s;${STAGING_INCDIR};${includedir};g" \ | ||
97 | -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ | ||
98 | ${PKGD}${libdir}/tclConfig.sh | ||
99 | |||
100 | rm -f ${PKGD}${bindir_crossscripts}/tclConfig.sh | ||
101 | } | ||