From a689cb8239360ba0c8b3e7934fe49fd8dfe449e8 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 17 Sep 2014 01:56:39 -0400 Subject: talloc: fixes for sstate cache reuse Fixes for sstate cache reuse between different build dirs. The ${SWIGLIBDIR##${STAGING_DIR_NATIVE}} had confused bitbake, bitbake would add the "SWIGLIBDIR##${STAGING_DIR_NATIVE}" to the deps of do_install, which caused the sstate cached can't be re-used. Use another way for SWIGLIBDIR to fix the problem. Signed-off-by: Robert Yang Signed-off-by: Wenzong Fan Signed-off-by: Martin Jansa --- meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb index 9cf3e43224..7bbfbc291c 100644 --- a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb +++ b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb @@ -23,7 +23,15 @@ DEPENDS += "swig-native" do_install_prepend() { # Hack the way swig interface for talloc is installed # This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch - type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=`readlink -f ${SWIGLIBDIR}` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found" + if which swig > /dev/null; then + SWIGLIBDIR="$(echo $(readlink -f $(swig -swiglib)) | \ + sed -e 's#^${STAGING_DIR_NATIVE}##')" + fi + if [ -n "$SWIGLIBDIR" ]; then + export SWIGLIBDIR + else + echo "No swig found" + fi } do_install_append() { -- cgit 1.2.3-korg