libvpx: Pull from upstream

source/libvpx/build/make/iosbuild.sh

 #!/bin/sh
 ##
 ##  Copyright (c) 2014 The WebM project authors. All Rights Reserved.
 ##
 ##  Use of this source code is governed by a BSD-style license
 ##  that can be found in the LICENSE file in the root of the source
 ##  tree. An additional intellectual property rights grant can be found
 ##  in the file PATENTS.  All contributing project authors may
 ##  be found in the AUTHORS file in the root of the source tree.
 ##
@@ skipping 25 matching lines @@
 # target using $DIST_DIR as the distribution output directory.
 build_target() {
   local target="$1"
   local old_pwd="$(pwd)"
 
   vlog "***Building target: ${target}***"
 
   mkdir "${target}"
   cd "${target}"
   eval "../../${LIBVPX_SOURCE_DIR}/configure" --target="${target}" \
-      --disable-docs ${devnull}
+      --disable-docs ${EXTRA_CONFIGURE_ARGS} ${devnull}
   export DIST_DIR
   eval make -j ${MAKE_JOBS} dist ${devnull}
   cd "${old_pwd}"
 
   vlog "***Done building target: ${target}***"
 }
 
 # Returns the preprocessor symbol for the target specified by $1.
 target_to_preproc_symbol() {
   target="$1"
   case "${target}" in
     arm64-*)
       echo "__aarch64__"
       ;;
     armv6-*)
       echo "__ARM_ARCH_6__"
       ;;
     armv7-*)
-      echo "__ARM_ARCH_7__"
+      echo "__ARM_ARCH_7A__"
       ;;
     armv7s-*)
       echo "__ARM_ARCH_7S__"
       ;;
     x86-*)
       echo "__i386__"
       ;;
     x86_64-*)
       echo "__x86_64__"
       ;;
@@ skipping 123 matching lines @@
   if [ "${VERBOSE}" = "yes" ]; then
     echo "$@"
   fi
 }
 
 trap cleanup EXIT
 
 # Parse the command line.
 while [ -n "$1" ]; do
   case "$1" in
+    --extra-configure-args)
+      EXTRA_CONFIGURE_ARGS="$2"
+      shift
+      ;;
     --help)
       iosbuild_usage
       exit
       ;;
     --jobs)
       MAKE_JOBS="$2"
       shift
       ;;
     --preserve-build-output)
       PRESERVE_BUILD_OUTPUT=yes
       ;;
     --show-build-output)
       devnull=
       ;;
     --verbose)
       VERBOSE=yes
       ;;
     *)
       iosbuild_usage
       exit 1
       ;;
   esac
   shift
 done
 
 if [ "${VERBOSE}" = "yes" ]; then
 cat << EOF
   BUILD_ROOT=${BUILD_ROOT}
   DIST_DIR=${DIST_DIR}
+  EXTRA_CONFIGURE_ARGS=${EXTRA_CONFIGURE_ARGS}
   FRAMEWORK_DIR=${FRAMEWORK_DIR}
   HEADER_DIR=${HEADER_DIR}
   MAKE_JOBS=${MAKE_JOBS}
   PRESERVE_BUILD_OUTPUT=${PRESERVE_BUILD_OUTPUT}
   LIBVPX_SOURCE_DIR=${LIBVPX_SOURCE_DIR}
   LIPO=${LIPO}
   ORIG_PWD=${ORIG_PWD}
   TARGETS="${TARGETS}"
 EOF
 fi
 
 build_framework "${TARGETS}"