[oe-commits] [openembedded-core] 07/16: icecc: patchelf is needed by icecc-create-env

git at git.openembedded.org git at git.openembedded.org
Sat Dec 22 18:17:47 UTC 2018


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

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

commit 0860216a81092fba084d29696db6d0c65a226c85
Author: Douglas Royds <douglas.royds at taitradio.com>
AuthorDate: Thu Dec 20 11:59:48 2018 +1300

    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.
    
    Signed-off-by: Douglas Royds <douglas.royds at taitradio.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/icecc.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 4959717..7d94525 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}

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


More information about the Openembedded-commits mailing list