diff options
author | Guillaume Martres <gmartres@google.com> | 2013-08-13 18:46:58 -0700 |
---|---|---|
committer | Guillaume Martres <gmartres@google.com> | 2013-08-13 18:48:35 -0700 |
commit | 3526f1cd5e24006b82b9b26062993d74ee4d73b7 (patch) | |
tree | e23ef056894f247db452fa52fdc1100602a61cbe | |
parent | bcc8e9d9c6b28b3b3ddc58e88aa59d63b12aa836 (diff) | |
download | libvpx-3526f1cd5e24006b82b9b26062993d74ee4d73b7.tar libvpx-3526f1cd5e24006b82b9b26062993d74ee4d73b7.tar.gz libvpx-3526f1cd5e24006b82b9b26062993d74ee4d73b7.tar.bz2 libvpx-3526f1cd5e24006b82b9b26062993d74ee4d73b7.zip |
Get rid of bashisms in the main build scripts
The conversion was done with the help of the checkbashisms script
and https://wiki.ubuntu.com/DashAsBinSh .
Change-Id: Id64ecefb35c8d72302f343cd2ec442e7ef989d47
-rwxr-xr-x | build/make/configure.sh | 27 | ||||
-rwxr-xr-x | build/make/gen_asm_deps.sh | 2 | ||||
-rwxr-xr-x | build/make/version.sh | 2 | ||||
-rwxr-xr-x | configure | 2 |
4 files changed, 17 insertions, 16 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index e2566b0a7..d8e65e32d 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ## ## configure.sh ## @@ -264,12 +264,13 @@ elif test ! -z "$TEMPDIR" ; then else TMPDIRx="/tmp" fi -TMP_H="${TMPDIRx}/vpx-conf-$$-${RANDOM}.h" -TMP_C="${TMPDIRx}/vpx-conf-$$-${RANDOM}.c" -TMP_CC="${TMPDIRx}/vpx-conf-$$-${RANDOM}.cc" -TMP_O="${TMPDIRx}/vpx-conf-$$-${RANDOM}.o" -TMP_X="${TMPDIRx}/vpx-conf-$$-${RANDOM}.x" -TMP_ASM="${TMPDIRx}/vpx-conf-$$-${RANDOM}.asm" +RAND=$(awk 'BEGIN { srand(); printf "%d\n",(rand() * 32768)}') +TMP_H="${TMPDIRx}/vpx-conf-$$-${RAND}.h" +TMP_C="${TMPDIRx}/vpx-conf-$$-${RAND}.c" +TMP_CC="${TMPDIRx}/vpx-conf-$$-${RAND}.cc" +TMP_O="${TMPDIRx}/vpx-conf-$$-${RAND}.o" +TMP_X="${TMPDIRx}/vpx-conf-$$-${RAND}.x" +TMP_ASM="${TMPDIRx}/vpx-conf-$$-${RAND}.asm" clean_temp_files() { rm -f ${TMP_C} ${TMP_CC} ${TMP_H} ${TMP_O} ${TMP_X} ${TMP_ASM} @@ -805,7 +806,7 @@ process_common_toolchain() { arch_int=${arch_int%%te} check_add_asflags --defsym ARCHITECTURE=${arch_int} tune_cflags="-mtune=" - if [ ${tgt_isa} == "armv7" ]; then + if [ ${tgt_isa} = "armv7" ]; then if [ -z "${float_abi}" ]; then check_cpp <<EOF && float_abi=hard || float_abi=softfp #ifndef __ARM_PCS_VFP @@ -855,7 +856,7 @@ EOF tune_cflags="--cpu=" tune_asflags="--cpu=" if [ -z "${tune_cpu}" ]; then - if [ ${tgt_isa} == "armv7" ]; then + if [ ${tgt_isa} = "armv7" ]; then if enabled neon then check_add_cflags --fpu=softvfp+vfpv3 @@ -915,7 +916,7 @@ EOF enable pic soft_enable realtime_only - if [ ${tgt_isa} == "armv7" ]; then + if [ ${tgt_isa} = "armv7" ]; then soft_enable runtime_cpu_detect fi if enabled runtime_cpu_detect; then @@ -1191,7 +1192,7 @@ EOF # default use_x86inc to yes if pic is no or 64bit or we are not on darwin echo " checking here for x86inc \"${tgt_isa}\" \"$pic\" " - if [ ${tgt_isa} = x86_64 -o ! "$pic" == "yes" -o ! ${tgt_os:0:6} = darwin ]; then + if [ ${tgt_isa} = x86_64 -o ! "$pic" = "yes" -o "${tgt_os#darwin}" = "${tgt_os}" ]; then soft_enable use_x86inc fi @@ -1287,8 +1288,8 @@ print_config_h() { print_webm_license() { local destination=$1 - local prefix=$2 - local suffix=$3 + local prefix="$2" + local suffix="$3" shift 3 cat <<EOF > ${destination} ${prefix} Copyright (c) 2011 The WebM project authors. All Rights Reserved.${suffix} diff --git a/build/make/gen_asm_deps.sh b/build/make/gen_asm_deps.sh index 0b4e3aa84..6a7bff9eb 100755 --- a/build/make/gen_asm_deps.sh +++ b/build/make/gen_asm_deps.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ## ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## diff --git a/build/make/version.sh b/build/make/version.sh index 3efb956bb..e31e568aa 100755 --- a/build/make/version.sh +++ b/build/make/version.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ## ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. ## @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ## ## configure ## |