mirror of
https://git.yoctoproject.org/poky-contrib
synced 2025-05-08 23:52:25 +08:00
icecc: convert set_icecc_env to python prefuncs
Since bitbake commit f24bbaaddb36 ("data: Add support for new
BB_HASH_CODEPARSER_VALS for cache optimisation") the icecc fails with [1]:
ERROR: /Yocto/poky/meta/recipes-core/meta/target-sdk-provides-dummy.bb: no-pn NULL prefix
WARNING: /Yocto/poky/meta/recipes-core/meta/target-sdk-provides-dummy.bb: Exception during build_dependencies for set_icecc_env
The reason for this is the bb.fatal() within the icecc_version().
icecc_version() is called during the "${@}" python variable expansion
while bitbake is running the build_dependencies() for the
set_icecc_env() function.
To avoid this behaviour set_icecc_env() should be converted into a
python function which gets called during task[prefuncs] [2], which is
done by this commit.
[1] https://lists.yoctoproject.org/g/yocto/topic/icecc_support_broken/103429714
[2] https://lists.openembedded.org/g/openembedded-core/topic/110009272
(From OE-Core rev: 444445c5793aaf831ff0293b62a000f8ab7d40bb)
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Marco Felsch
Richard Purdie
parent
22f046d67c
commit
f391bf2c08
@ -304,145 +304,127 @@ def icecc_get_and_check_tool(bb, d, tool):
|
||||
else:
|
||||
return t
|
||||
|
||||
wait_for_file() {
|
||||
local TIME_ELAPSED=0
|
||||
local FILE_TO_TEST=$1
|
||||
local TIMEOUT=$2
|
||||
until [ -f "$FILE_TO_TEST" ]
|
||||
do
|
||||
TIME_ELAPSED=$(expr $TIME_ELAPSED + 1)
|
||||
if [ $TIME_ELAPSED -gt $TIMEOUT ]
|
||||
then
|
||||
return 1
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
}
|
||||
|
||||
def set_icecc_env():
|
||||
# dummy python version of set_icecc_env
|
||||
return
|
||||
|
||||
set_icecc_env[vardepsexclude] += "KERNEL_CC"
|
||||
set_icecc_env() {
|
||||
if [ "${@use_icecc(bb, d)}" = "no" ]
|
||||
then
|
||||
return
|
||||
fi
|
||||
ICECC_VERSION="${@icecc_version(bb, d)}"
|
||||
if [ "x${ICECC_VERSION}" = "x" ]
|
||||
then
|
||||
bbwarn "Cannot use icecc: could not get ICECC_VERSION"
|
||||
return
|
||||
fi
|
||||
python set_icecc_env() {
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
ICE_PATH="${@icecc_path(bb, d)}"
|
||||
if [ "x${ICE_PATH}" = "x" ]
|
||||
then
|
||||
bbwarn "Cannot use icecc: could not get ICE_PATH"
|
||||
if use_icecc(bb, d) == "no":
|
||||
return
|
||||
ICECC_VERSION = icecc_version(bb, d)
|
||||
if not ICECC_VERSION:
|
||||
bb.warn("Cannot use icecc: could not get ICECC_VERSION")
|
||||
return
|
||||
fi
|
||||
|
||||
ICECC_BIN="${@get_icecc(d)}"
|
||||
if [ -z "${ICECC_BIN}" ]; then
|
||||
bbwarn "Cannot use icecc: icecc binary not found"
|
||||
ICE_PATH = icecc_path(bb, d)
|
||||
if not ICE_PATH:
|
||||
bb.warn("Cannot use icecc: could not get ICE_PATH")
|
||||
return
|
||||
fi
|
||||
if [ -z "$(which patchelf patchelf-uninative)" ]; then
|
||||
bbwarn "Cannot use icecc: patchelf not found"
|
||||
return
|
||||
fi
|
||||
|
||||
ICECC_CC="${@icecc_get_and_check_tool(bb, d, "gcc")}"
|
||||
ICECC_CXX="${@icecc_get_and_check_tool(bb, d, "g++")}"
|
||||
ICECC_BIN = get_icecc(d)
|
||||
if not ICECC_BIN:
|
||||
bb.warn("Cannot use icecc: icecc binary not found")
|
||||
return
|
||||
|
||||
if (not bb.utils.which(os.getenv("PATH"), "patchelf") and
|
||||
not bb.utils.which(os.getenv("PATH"), "patchelf-uninative")):
|
||||
bb.warn("Cannot use icecc: patchelf not found")
|
||||
return
|
||||
|
||||
ICECC_CC = icecc_get_and_check_tool(bb, d, "gcc")
|
||||
ICECC_CXX = icecc_get_and_check_tool(bb, d, "g++")
|
||||
# cannot use icecc_get_and_check_tool here because it assumes as without target_sys prefix
|
||||
ICECC_WHICH_AS="${@bb.utils.which(os.getenv('PATH'), 'as')}"
|
||||
if [ ! -x "${ICECC_CC}" -o ! -x "${ICECC_CXX}" ]
|
||||
then
|
||||
bbnote "Cannot use icecc: could not get ICECC_CC or ICECC_CXX"
|
||||
ICECC_WHICH_AS = bb.utils.which(os.getenv('PATH'), 'as')
|
||||
if (not os.access(ICECC_CC, os.X_OK) or
|
||||
not os.access(ICECC_CXX, os.X_OK)):
|
||||
bb.note("Cannot use icecc: could not get ICECC_CC or ICECC_CXX")
|
||||
return
|
||||
fi
|
||||
|
||||
ICE_VERSION="$($ICECC_CC -dumpversion)"
|
||||
ICECC_VERSION=$(echo ${ICECC_VERSION} | sed -e "s/@VERSION@/$ICE_VERSION/g")
|
||||
if [ ! -x "${ICECC_ENV_EXEC}" ]
|
||||
then
|
||||
bbwarn "Cannot use icecc: invalid ICECC_ENV_EXEC"
|
||||
cmd = []
|
||||
try:
|
||||
cmd = [ICECC_CC, '-dumpversion']
|
||||
ICE_VERSION = subprocess.check_output(cmd).decode("utf-8").strip()
|
||||
except subprocess.CalledProcessError as e:
|
||||
bb.warn("icecc: '{}' returned {}:\n{}".format(cmd, e.returncode, e.output.decode("utf-8")))
|
||||
return
|
||||
|
||||
ICECC_VERSION = ICECC_VERSION.replace("@VERSION@", ICE_VERSION)
|
||||
|
||||
if not os.access(d.getVar('ICECC_ENV_EXEC'), os.X_OK):
|
||||
bb.warn("Cannot use icecc: invalid ICECC_ENV_EXEC")
|
||||
return
|
||||
fi
|
||||
|
||||
# Create symlinks to icecc and wrapper-scripts in the recipe-sysroot directory
|
||||
mkdir -p $ICE_PATH/symlinks
|
||||
if [ -n "${KERNEL_CC}" ]; then
|
||||
compilers="${@get_cross_kernel_cc(bb,d)}"
|
||||
else
|
||||
compilers="${HOST_PREFIX}gcc ${HOST_PREFIX}g++"
|
||||
fi
|
||||
for compiler in $compilers; do
|
||||
ln -sf $ICECC_BIN $ICE_PATH/symlinks/$compiler
|
||||
cat <<-__EOF__ > $ICE_PATH/$compiler
|
||||
#!/bin/sh -e
|
||||
export ICECC_VERSION=$ICECC_VERSION
|
||||
export ICECC_CC=$ICECC_CC
|
||||
export ICECC_CXX=$ICECC_CXX
|
||||
$ICE_PATH/symlinks/$compiler "\$@"
|
||||
__EOF__
|
||||
chmod 775 $ICE_PATH/$compiler
|
||||
done
|
||||
symlink_path = os.path.join(ICE_PATH, "symlinks")
|
||||
bb.utils.mkdirhier(symlink_path)
|
||||
compilers = []
|
||||
if d.getVar('KERNEL_CC'):
|
||||
compilers.append(get_cross_kernel_cc(bb,d))
|
||||
else:
|
||||
host_prefix = d.getVar('HOST_PREFIX')
|
||||
compilers.extend([host_prefix + 'gcc', host_prefix + 'g++'])
|
||||
|
||||
ICECC_AS="$(${ICECC_CC} -print-prog-name=as)"
|
||||
for compiler in compilers:
|
||||
try:
|
||||
os.symlink(ICECC_BIN, symlink_path + '/' + compiler)
|
||||
except FileExistsError:
|
||||
pass
|
||||
wrapper_script = os.path.join(ICE_PATH, compiler)
|
||||
with open(wrapper_script, 'w') as fd:
|
||||
fd.write("#!/bin/sh -e\n")
|
||||
fd.write("export ICECC_VERSION={}\n".format(ICECC_VERSION))
|
||||
fd.write("export ICECC_CC={}\n".format(ICECC_CC))
|
||||
fd.write("export ICECC_CXX={}\n".format(ICECC_CXX))
|
||||
fd.write("{} \"$@\"\n".format(os.path.join(ICE_PATH, "symlinks", compiler)))
|
||||
os.chmod(wrapper_script, 0o755)
|
||||
|
||||
try:
|
||||
cmd = [ICECC_CC, '-print-prog-name=as']
|
||||
ICECC_AS = subprocess.check_output(cmd).decode("utf-8").strip()
|
||||
except subprocess.CalledProcessError as e:
|
||||
bb.warn("icecc: '{}' returned {}:\n{}".format(cmd, e.returncode, e.output.decode("utf-8")))
|
||||
return
|
||||
# for target recipes should return something like:
|
||||
# /OE/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm920tt-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.8.2/as
|
||||
# and just "as" for native, if it returns "as" in current directory (for whatever reason) use "as" from PATH
|
||||
if [ "$(dirname "${ICECC_AS}")" = "." ]
|
||||
then
|
||||
ICECC_AS="${ICECC_WHICH_AS}"
|
||||
fi
|
||||
if not os.path.dirname(ICECC_AS):
|
||||
ICECC_AS = ICECC_WHICH_AS
|
||||
|
||||
if [ ! -f "${ICECC_VERSION}.done" ]
|
||||
then
|
||||
mkdir -p "$(dirname "${ICECC_VERSION}")"
|
||||
if not os.path.isfile(ICECC_VERSION + ".done"):
|
||||
bb.utils.mkdirhier(os.path.dirname(ICECC_VERSION))
|
||||
|
||||
# the ICECC_VERSION generation step must be locked by a mutex
|
||||
# in order to prevent race conditions
|
||||
if flock -n "${ICECC_VERSION}.lock" \
|
||||
${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}"
|
||||
then
|
||||
touch "${ICECC_VERSION}.done"
|
||||
elif ! wait_for_file "${ICECC_VERSION}.done" 30
|
||||
then
|
||||
# locking failed so wait for ${ICECC_VERSION}.done to appear
|
||||
bbwarn "Timeout waiting for ${ICECC_VERSION}.done"
|
||||
lock = bb.utils.lockfile(ICECC_VERSION + '.lock')
|
||||
try:
|
||||
cmd = [d.getVar('ICECC_ENV_EXEC')]
|
||||
if d.getVar('ICECC_ENV_DEBUG'):
|
||||
cmd.append(d.getVar('ICECC_ENV_DEBUG'))
|
||||
cmd.extend([ICECC_CC, ICECC_CXX, ICECC_AS, ICECC_VERSION])
|
||||
subprocess.check_output(cmd)
|
||||
cmd = ['touch', ICECC_VERSION + '.done']
|
||||
subprocess.check_output(cmd)
|
||||
except subprocess.CalledProcessError as e:
|
||||
bb.warn("icecc: '{}' returned {}:\n{}".format(cmd, e.returncode, e.output.decode("utf-8")))
|
||||
bb.utils.unlockfile(lock)
|
||||
return
|
||||
fi
|
||||
fi
|
||||
bb.utils.unlockfile(lock)
|
||||
|
||||
# Don't let ccache find the icecream compiler links that have been created, otherwise
|
||||
# it can end up invoking icecream recursively.
|
||||
export CCACHE_PATH="$PATH"
|
||||
export CCACHE_DISABLE="1"
|
||||
d.setVar('CCACHE_PATH', d.getVar('PATH'))
|
||||
d.setVar('CCACHE_DISABLE', '1')
|
||||
|
||||
export PATH="$ICE_PATH:$PATH"
|
||||
d.prependVar('PATH', ICE_PATH + ':')
|
||||
|
||||
bbnote "Using icecc path: $ICE_PATH"
|
||||
bbnote "Using icecc tarball: $ICECC_VERSION"
|
||||
bb.note("Using icecc path: {}".format(ICE_PATH))
|
||||
bb.note("Using icecc tarball: {}".format(ICECC_VERSION))
|
||||
}
|
||||
|
||||
do_configure:prepend() {
|
||||
set_icecc_env
|
||||
}
|
||||
|
||||
do_compile:prepend() {
|
||||
set_icecc_env
|
||||
}
|
||||
|
||||
do_compile_kernelmodules:prepend() {
|
||||
set_icecc_env
|
||||
}
|
||||
|
||||
do_install:prepend() {
|
||||
set_icecc_env
|
||||
}
|
||||
do_configure[prefuncs] += "set_icecc_env"
|
||||
do_compile[prefuncs] += "set_icecc_env"
|
||||
do_compile_kernelmodules[prefuncs] += "set_icecc_env"
|
||||
do_install[prefuncs] += "set_icecc_env"
|
||||
|
||||
# Icecream is not (currently) supported in the extensible SDK
|
||||
ICECC_SDK_HOST_TASK = "nativesdk-icecc-toolchain"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user