From d1fe651fddace8beaa2f68e4d111cc053e6f08b9 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Wed, 3 Apr 2019 14:21:34 -1000 Subject: Don't use [[ in vpx --- data/vpx/toolchain.diff | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/vpx/toolchain.diff b/data/vpx/toolchain.diff index b72ec9ae9..8f60f97f5 100644 --- a/data/vpx/toolchain.diff +++ b/data/vpx/toolchain.diff @@ -1,6 +1,6 @@ diff -ur libvpx-1.8.0/build/make/Makefile libvpx-1.8.0+iPhone/build/make/Makefile --- libvpx-1.8.0/build/make/Makefile 2019-02-04 07:02:33.000000000 -1000 -+++ libvpx-1.8.0+iPhone/build/make/Makefile 2019-04-03 09:52:14.000000000 -1000 ++++ libvpx-1.8.0+iPhone/build/make/Makefile 2019-04-03 14:16:22.000000000 -1000 @@ -70,9 +70,15 @@ ASFLAGS+=-I$(BUILD_PFX)$(BUILD_ROOT)/ -I$(SRC_PATH)/ DIST_DIR?=dist @@ -19,7 +19,7 @@ diff -ur libvpx-1.8.0/build/make/Makefile libvpx-1.8.0+iPhone/build/make/Makefil diff -ur libvpx-1.8.0/build/make/configure.sh libvpx-1.8.0+iPhone/build/make/configure.sh --- libvpx-1.8.0/build/make/configure.sh 2019-02-04 07:02:33.000000000 -1000 -+++ libvpx-1.8.0+iPhone/build/make/configure.sh 2019-04-03 09:58:47.000000000 -1000 ++++ libvpx-1.8.0+iPhone/build/make/configure.sh 2019-04-03 14:17:28.000000000 -1000 @@ -771,35 +771,27 @@ # detect tgt_os case "$gcctarget" in @@ -63,7 +63,7 @@ diff -ur libvpx-1.8.0/build/make/configure.sh libvpx-1.8.0+iPhone/build/make/con - tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') - tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') - tgt_cc=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') -+ if [[ "$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print NF}')" == "4" ]]; then ++ if [ "$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print NF}')" == "4" ]; then + tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') + tgt_flavor=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') + tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') @@ -143,7 +143,7 @@ diff -ur libvpx-1.8.0/build/make/configure.sh libvpx-1.8.0+iPhone/build/make/con linux*) diff -ur libvpx-1.8.0/configure libvpx-1.8.0+iPhone/configure --- libvpx-1.8.0/configure 2019-02-04 07:02:33.000000000 -1000 -+++ libvpx-1.8.0+iPhone/configure 2019-04-03 09:08:31.000000000 -1000 ++++ libvpx-1.8.0+iPhone/configure 2019-04-03 14:16:22.000000000 -1000 @@ -100,9 +100,11 @@ # alphabetically by architecture, generic-gnu last. all_platforms="${all_platforms} arm64-android-gcc" -- cgit v1.2.3