mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
icecc.bbclass: replace deprecated bash command substitution
- build some packages with icecc enabled is not supported because of the folling that disables the icecc: DEBUG: while parsing set_icecc_env, unable to handle non-literal command '$ICECC_CC' - it can be replicated with: bitbake make && bitbake make -c cleansstate && bitbake make -DD grep ICECC_CC tmp/log/cooker/qemux86-64/console-latest.log - bash command substitution backquote deprecated https://www.gnu.org/software/bash/manual/html_node/Command-Substitution.html https://mywiki.wooledge.org/BashFAQ/082 (From OE-Core rev: b4e3983f38af5a5484b33de43449ae85b7e4f104) Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
efa450bfbf
commit
379519795a
@@ -309,7 +309,7 @@ wait_for_file() {
|
||||
local TIMEOUT=$2
|
||||
until [ -f "$FILE_TO_TEST" ]
|
||||
do
|
||||
TIME_ELAPSED=`expr $TIME_ELAPSED + 1`
|
||||
TIME_ELAPSED=$(expr $TIME_ELAPSED + 1)
|
||||
if [ $TIME_ELAPSED -gt $TIMEOUT ]
|
||||
then
|
||||
return 1
|
||||
@@ -362,8 +362,8 @@ set_icecc_env() {
|
||||
return
|
||||
fi
|
||||
|
||||
ICE_VERSION=`$ICECC_CC -dumpversion`
|
||||
ICECC_VERSION=`echo ${ICECC_VERSION} | sed -e "s/@VERSION@/$ICE_VERSION/g"`
|
||||
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"
|
||||
@@ -390,18 +390,18 @@ set_icecc_env() {
|
||||
chmod 775 $ICE_PATH/$compiler
|
||||
done
|
||||
|
||||
ICECC_AS="`${ICECC_CC} -print-prog-name=as`"
|
||||
ICECC_AS="$(${ICECC_CC} -print-prog-name=as)"
|
||||
# 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}"`" = "." ]
|
||||
if [ "$(dirname "${ICECC_AS}")" = "." ]
|
||||
then
|
||||
ICECC_AS="${ICECC_WHICH_AS}"
|
||||
fi
|
||||
|
||||
if [ ! -f "${ICECC_VERSION}.done" ]
|
||||
then
|
||||
mkdir -p "`dirname "${ICECC_VERSION}"`"
|
||||
mkdir -p "$(dirname "${ICECC_VERSION}")"
|
||||
|
||||
# the ICECC_VERSION generation step must be locked by a mutex
|
||||
# in order to prevent race conditions
|
||||
|
||||
Reference in New Issue
Block a user