From 8163c7cbdeea8db2f7cdb329d3d0254f66724683 Mon Sep 17 00:00:00 2001 From: Douglas Royds Date: Thu, 20 Dec 2018 11:59:48 +1300 Subject: icecc: patchelf is needed by icecc-create-env Although we could potentially build patchelf and all its dependencies, they would all have to be blacklisted to avoid trying to build them with icecc. We use the host patchelf instead. (From OE-Core rev: 0860216a81092fba084d29696db6d0c65a226c85) (From OE-Core rev: 9d3587dda0e068efb72a89fd94002f13882fe335) Signed-off-by: Douglas Royds Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/classes/icecc.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/classes/icecc.bbclass') diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 49597175ca..7d94525d31 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -38,7 +38,7 @@ BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED ICECC_USER_PACKAGE_ ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env" -HOSTTOOLS_NONFATAL += "icecc" +HOSTTOOLS_NONFATAL += "icecc patchelf" # This version can be incremented when changes are made to the environment that # invalidate the version on the compile nodes. Changing it will cause a new @@ -326,6 +326,10 @@ set_icecc_env() { bbwarn "Cannot use icecc: icecc binary not found" return fi + if [ -z "$(which patchelf patchelf-uninative)" ]; then + bbwarn "Cannot use icecc: patchelf not found" + return + fi # Create symlinks to icecc in the recipe-sysroot directory mkdir -p ${ICE_PATH} -- cgit v1.2.3-54-g00ecf