aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-07-05 11:16:14 +0100
committerRoss Burton <ross.burton@intel.com>2019-11-25 16:20:35 +0000
commita3a463483f1daafcd2cd04673ff1d0376930445b (patch)
tree8ba8d2f4465b017df4b9f225e212b91259eda4e6
parent7f85ea958f0c7af68c2ef678af5f4ee594ac026d (diff)
downloadmeta-openembedded-contrib-ross/binconfig.tar.gz
meta-openembedded-contrib-ross/binconfig.tar.bz2
meta-openembedded-contrib-ross/binconfig.zip
tk: fix for binconfig/tcl changes in oe-coreross/binconfig
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb19
1 files changed, 2 insertions, 17 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb
index 3d77670749..e9c5396275 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb
@@ -42,7 +42,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_OECONF = "\
--enable-threads \
--with-x \
- --with-tcl=${STAGING_BINDIR}/crossscripts \
+ --with-tcl=${STAGING_BINDIR_CROSS} \
--libdir=${libdir} \
"
export TK_LIBRARY='${libdir}/tk${VER}'
@@ -77,20 +77,5 @@ SSTATE_SCAN_FILES += "*Config.sh"
inherit binconfig
-SYSROOT_DIRS += "${bindir_crossscripts}"
-
# Fix some paths that might be used by Tcl extensions
-BINCONFIG_GLOB = "*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}/tkConfig.sh
-
- rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh
-}
+BINCONFIG = "${libdir}/*Config.sh"