scripts/*: rename 'INDENT' variable to not interference with upcoming Mesa's 'INDENT' variable

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-10-22 02:00:23 +02:00
parent 18f215accb
commit 62b661caa5
7 changed files with 16 additions and 16 deletions

View File

@ -144,4 +144,4 @@ else
exec 3>&2
exec 4>/dev/null
fi
INDENT_SIZE=4
BUILD_INDENT_SIZE=4

View File

@ -24,8 +24,8 @@
[ ! -f "$PKG_BUILD/configure.in" -a ! -f "$PKG_BUILD/configure.ac" ] && echo "configure.in or configure.ac not found" && exit 1
printf "%${INDENT}c AUTORECONF $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
printf "%${BUILD_INDENT}c AUTORECONF $1\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
do_autoreconf $PKG_BUILD

View File

@ -50,8 +50,8 @@ fi
if [ ! -f $STAMP ]; then
rm -f $STAMP
printf "%${INDENT}c BUILD $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
printf "%${BUILD_INDENT}c BUILD $1\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
for p in $PKG_BUILD_DEPENDS; do
$SCRIPTS/build $p

View File

@ -43,8 +43,8 @@ fi
$SCRIPTS/build $@
printf "%${INDENT}c CREATE ADDON $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
printf "%${BUILD_INDENT}c CREATE ADDON $1\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
if [ -f $PKG_DIR/addon ]; then

View File

@ -57,8 +57,8 @@ if [ -n "$PKG_URL" ]; then
rm -f $STAMP
printf "%${INDENT}c GET $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
printf "%${BUILD_INDENT}c GET $1\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
until [ -f "$STAMP" ] || $WGET_CMD $i || $WGET_CMD $PACKAGE_MIRROR; do
NBWGET=$(($NBWGET+1))

View File

@ -65,8 +65,8 @@ fi
$SCRIPTS/build $@
printf "%${INDENT}c INSTALL $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
printf "%${BUILD_INDENT}c INSTALL $1\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
for p in $PKG_DEPENDS; do
$SCRIPTS/install $p

View File

@ -47,8 +47,8 @@ done
[ -f "$STAMP" ] && exit 0
printf "%${INDENT}c UNPACK $1\n" ' '>&$SILENT_OUT
export INDENT=$((${INDENT:-1}+$INDENT_SIZE))
printf "%${BUILD_INDENT}c UNPACK $1\n" ' '>&$SILENT_OUT
export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
rm -rf $BUILD/$1[-_][0-9]*
rm -rf $BUILD/$1[-_]r[0-9]*
@ -82,10 +82,10 @@ for i in $PKG_DIR/patches/$PKG_NAME-$PKG_VERSION*.patch ; do
PATCH=`basename $i`
PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'`
if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then
printf "%${INDENT}c SKIP PATCH: $i\n" ' '>&$SILENT_OUT
printf "%${BUILD_INDENT}c SKIP PATCH: $i\n" ' '>&$SILENT_OUT
continue;
else
printf "%${INDENT}c APPLY PATCH: $i\n" ' '>&$SILENT_OUT
printf "%${BUILD_INDENT}c APPLY PATCH: $i\n" ' '>&$SILENT_OUT
cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
fi
fi
@ -94,7 +94,7 @@ done
[ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT
for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
printf "%${INDENT}c FIXCONFIG: $config\n" ' '>&$SILENT_OUT
printf "%${BUILD_INDENT}c FIXCONFIG: $config\n" ' '>&$SILENT_OUT
[ -f "$config/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $config
[ -f "$config/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config